merge fix and fix in model file

Former-commit-id: 79c630c3e4

examples/multiobjective/ma/stream/stream2.ma

@@ -8,10 +8,11 @@ const double processingRate = 5;
 
 module streamingclient
 	
-	s : [0..2]; // current state:
+	s : [0..3]; // current state:
 	// 0: decide whether to start	
 	// 1: buffering
 	// 2: running
+	// 3: done
 	
 	n : [0..N]; // number of received packages
 	k : [0..N]; // number of processed packages 	

src/solver/StandardMinMaxLinearEquationSolver.cpp

@@ -224,11 +224,11 @@ namespace storm {
             // If requested, we store the scheduler for retrieval.
             if (this->isTrackSchedulerSet()) {
                 if(iterations==0){ //may happen due to custom termination condition. Then we need to compute x'= A*x+b
-                    solver->multiply(x, *multiplyResult, &b);
+                    solver->multiply(x, &b, *auxiliarySolvingMultiplyMemory);
                 }
                 std::vector<storm::storage::sparse::state_type> choices(this->A.getRowGroupCount());
                 // Reduce the multiplyResult and keep track of the choices made
-                storm::utility::vector::reduceVectorMinOrMax(dir, *multiplyResult, x, this->A.getRowGroupIndices(), &choices);
+                storm::utility::vector::reduceVectorMinOrMax(dir, *auxiliarySolvingMultiplyMemory, x, this->A.getRowGroupIndices(), &choices);
                 this->scheduler = std::make_unique<storm::storage::TotalScheduler>(std::move(choices));
             }