diff --git a/src/storm/modelchecker/multiobjective/pcaa/StandardPcaaWeightVectorChecker.cpp b/src/storm/modelchecker/multiobjective/pcaa/StandardPcaaWeightVectorChecker.cpp index e3c734bf0..9a8b39c4e 100644 --- a/src/storm/modelchecker/multiobjective/pcaa/StandardPcaaWeightVectorChecker.cpp +++ b/src/storm/modelchecker/multiobjective/pcaa/StandardPcaaWeightVectorChecker.cpp @@ -194,8 +194,6 @@ namespace storm { std::fill(ecQuotient->auxStateValues.begin(), ecQuotient->auxStateValues.end(), storm::utility::zero()); solver->solveEquations(env, ecQuotient->auxStateValues, ecQuotient->auxChoiceValues); - this->overallPerformedIterations += solver->overallPerformedIterations; - solver->overallPerformedIterations = 0; this->weightedResult = std::vector(transitionMatrix.getRowGroupCount()); transformReducedSolutionToOriginalModel(ecQuotient->matrix, ecQuotient->auxStateValues, solver->getSchedulerChoices(), ecQuotient->ecqToOriginalChoiceMapping, ecQuotient->originalToEcqStateMapping, this->weightedResult, this->optimalChoices); @@ -278,9 +276,6 @@ namespace storm { STORM_LOG_THROW(req.empty(), storm::exceptions::UncheckedRequirementException, "At least one requirement of the LinearEquationSolver was not met."); solver->solveEquations(env, x, b); - this->overallPerformedIterations += solver->overallPerformedIterations; - solver->overallPerformedIterations = 0; - // Set the result for this objective accordingly storm::utility::vector::setVectorValues(objectiveResults[objIndex], maybeStates, x); } diff --git a/src/storm/modelchecker/multiobjective/pcaa/StandardPcaaWeightVectorChecker.h b/src/storm/modelchecker/multiobjective/pcaa/StandardPcaaWeightVectorChecker.h index 10cba6fbc..b28a80ac6 100644 --- a/src/storm/modelchecker/multiobjective/pcaa/StandardPcaaWeightVectorChecker.h +++ b/src/storm/modelchecker/multiobjective/pcaa/StandardPcaaWeightVectorChecker.h @@ -37,14 +37,6 @@ namespace storm { StandardPcaaWeightVectorChecker(SparseMultiObjectivePreprocessorResult const& preprocessorResult); - virtual ~StandardPcaaWeightVectorChecker() { - if (overallPerformedIterations != 0) { - std::cout << "PERFORMEDITERATIONS: " << overallPerformedIterations << std::endl; - } - } - - mutable uint64_t overallPerformedIterations = 0; - /*! * - computes the optimal expected reward w.r.t. the weighted sum of the rewards of the individual objectives * - extracts the scheduler that induces this optimum diff --git a/src/storm/solver/AbstractEquationSolver.h b/src/storm/solver/AbstractEquationSolver.h index 7d9013566..c71bed0a7 100644 --- a/src/storm/solver/AbstractEquationSolver.h +++ b/src/storm/solver/AbstractEquationSolver.h @@ -17,15 +17,6 @@ namespace storm { public: AbstractEquationSolver(); - virtual ~AbstractEquationSolver() { - if (overallPerformedIterations != 0) { - std::cout << "PERFORMEDITERATIONS: " << overallPerformedIterations << std::endl; - } - } - - mutable uint64_t overallPerformedIterations = 0; - - /*! * Sets a custom termination condition that is used together with the regular termination condition of the * solver. diff --git a/src/storm/solver/IterativeMinMaxLinearEquationSolver.cpp b/src/storm/solver/IterativeMinMaxLinearEquationSolver.cpp index 3b80a215b..8da065298 100644 --- a/src/storm/solver/IterativeMinMaxLinearEquationSolver.cpp +++ b/src/storm/solver/IterativeMinMaxLinearEquationSolver.cpp @@ -586,7 +586,6 @@ namespace storm { } reportStatus(status, iterations); - this->overallPerformedIterations += iterations; // We take the means of the lower and upper bound so we guarantee the desired precision. ValueType two = storm::utility::convertNumber(2.0); @@ -1062,8 +1061,6 @@ namespace storm { reportStatus(status, iterations); - this->overallPerformedIterations += iterations; - if (!this->isCachingEnabled()) { clearCache(); } diff --git a/src/storm/solver/NativeLinearEquationSolver.cpp b/src/storm/solver/NativeLinearEquationSolver.cpp index 96daa55b4..4251589ea 100644 --- a/src/storm/solver/NativeLinearEquationSolver.cpp +++ b/src/storm/solver/NativeLinearEquationSolver.cpp @@ -565,8 +565,6 @@ namespace storm { if (!this->isCachingEnabled()) { clearCache(); } - this->overallPerformedIterations += iterations; - this->logIterations(converged, terminate, iterations); return converged; @@ -832,8 +830,6 @@ namespace storm { this->logIterations(converged, terminate, iterations); - this->overallPerformedIterations += iterations; - if (!this->isCachingEnabled()) { clearCache(); } diff --git a/src/storm/solver/TopologicalLinearEquationSolver.cpp b/src/storm/solver/TopologicalLinearEquationSolver.cpp index e3e733407..bd5313381 100644 --- a/src/storm/solver/TopologicalLinearEquationSolver.cpp +++ b/src/storm/solver/TopologicalLinearEquationSolver.cpp @@ -82,7 +82,6 @@ namespace storm { for (auto const& scc : *this->sortedSccDecomposition) { if (scc.isTrivial()) { returnValue = solveTrivialScc(*scc.begin(), x, b) && returnValue; - ++this->overallPerformedIterations; } else { sccAsBitVector.clear(); for (auto const& state : scc) { @@ -93,10 +92,6 @@ namespace storm { } } - if (this->sccSolver) { - this->overallPerformedIterations += this->sccSolver->overallPerformedIterations; - this->sccSolver->overallPerformedIterations = 0; - } if (!this->isCachingEnabled()) { clearCache(); } diff --git a/src/storm/solver/TopologicalMinMaxLinearEquationSolver.cpp b/src/storm/solver/TopologicalMinMaxLinearEquationSolver.cpp index 70c478ffd..2c8951fc3 100644 --- a/src/storm/solver/TopologicalMinMaxLinearEquationSolver.cpp +++ b/src/storm/solver/TopologicalMinMaxLinearEquationSolver.cpp @@ -80,7 +80,6 @@ namespace storm { for (auto const& scc : *this->sortedSccDecomposition) { if (scc.isTrivial()) { returnValue = solveTrivialScc(*scc.begin(), dir, x, b) && returnValue; - ++this->overallPerformedIterations; } else { sccRowGroupsAsBitVector.clear(); sccRowsAsBitVector.clear(); @@ -104,12 +103,6 @@ namespace storm { } } - if (this->sccSolver) { - this->overallPerformedIterations += this->sccSolver->overallPerformedIterations; - this->sccSolver->overallPerformedIterations = 0; - } - - if (!this->isCachingEnabled()) { clearCache(); }