sp
/
tempest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Use general SolverStatus in StandardGameSolver

main
Matthias Volk 6 years ago
parent
0dd1c70e12
commit
acd5a94162
2 changed files with 22 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 40
      src/storm/solver/StandardGameSolver.cpp
  2. 9
      src/storm/solver/StandardGameSolver.h

40
src/storm/solver/StandardGameSolver.cpp
View File

@ -6,17 +6,15 @@
#include "storm/solver/EliminationLinearEquationSolver.h" #include "storm/solver/EliminationLinearEquationSolver.h"
#include "storm/environment/solver/GameSolverEnvironment.h" #include "storm/environment/solver/GameSolverEnvironment.h"
#include "storm/exceptions/InvalidEnvironmentException.h"
#include "storm/exceptions/InvalidStateException.h"
#include "storm/exceptions/NotImplementedException.h"
#include "storm/settings/SettingsManager.h" #include "storm/settings/SettingsManager.h"
#include "storm/settings/modules/GeneralSettings.h" #include "storm/settings/modules/GeneralSettings.h"
#include "storm/utility/ConstantsComparator.h" #include "storm/utility/ConstantsComparator.h"
#include "storm/utility/graph.h" #include "storm/utility/graph.h"
#include "storm/utility/vector.h" #include "storm/utility/vector.h"
#include "storm/utility/macros.h" #include "storm/utility/macros.h"
#include "storm/exceptions/InvalidEnvironmentException.h"
#include "storm/exceptions/InvalidStateException.h"
#include "storm/exceptions/NotImplementedException.h"
namespace storm { namespace storm {
namespace solver { namespace solver {
@ -187,7 +185,7 @@ namespace storm {
} }
submatrixSolver->setCachingEnabled(true); submatrixSolver->setCachingEnabled(true);
Status status = Status::InProgress;
SolverStatus status = SolverStatus::InProgress;
uint64_t iterations = 0; uint64_t iterations = 0;
do { do {
submatrixSolver->solveEquations(environmentOfSolver, x, subB); submatrixSolver->solveEquations(environmentOfSolver, x, subB);
@ -197,7 +195,7 @@ namespace storm {
// If the scheduler did not improve, we are done. // If the scheduler did not improve, we are done.
if (!schedulerImproved) { if (!schedulerImproved) {
status = Status::Converged;
status = SolverStatus::Converged;
} else { } else {
// Update the solver. // Update the solver.
getInducedMatrixVector(x, b, *player1Choices, *player2Choices, submatrix, subB); getInducedMatrixVector(x, b, *player1Choices, *player2Choices, submatrix, subB);
@ -229,7 +227,7 @@ namespace storm {
// Update environment variables. // Update environment variables.
++iterations; ++iterations;
status = updateStatusIfNotConverged(status, x, iterations, maxIter); status = updateStatusIfNotConverged(status, x, iterations, maxIter);
} while (status == Status::InProgress);
} while (status == SolverStatus::InProgress);
reportStatus(status, iterations); reportStatus(status, iterations);
@ -243,7 +241,7 @@ namespace storm {
clearCache(); clearCache();
} }
return status == Status::Converged || status == Status::TerminatedEarly;
return status == SolverStatus::Converged || status == SolverStatus::TerminatedEarly;
} }
template<typename ValueType> template<typename ValueType>
@ -314,15 +312,15 @@ namespace storm {
// Proceed with the iterations as long as the method did not converge or reach the maximum number of iterations. // Proceed with the iterations as long as the method did not converge or reach the maximum number of iterations.
uint64_t iterations = 0; uint64_t iterations = 0;
Status status = Status::InProgress;
while (status == Status::InProgress) {
SolverStatus status = SolverStatus::InProgress;
while (status == SolverStatus::InProgress) {
multiplyAndReduce(env, player1Dir, player2Dir, *currentX, &b, *multiplierPlayer2Matrix, reducedPlayer2Result, *newX, multiplyAndReduce(env, player1Dir, player2Dir, *currentX, &b, *multiplierPlayer2Matrix, reducedPlayer2Result, *newX,
trackSchedulersInValueIteration ? (trackingSchedulersInProvidedStorage ? player1Choices : &this->player1SchedulerChoices.get()) : nullptr, trackSchedulersInValueIteration ? (trackingSchedulersInProvidedStorage ? player1Choices : &this->player1SchedulerChoices.get()) : nullptr,
trackSchedulersInValueIteration ? (trackingSchedulersInProvidedStorage ? player2Choices : &this->player2SchedulerChoices.get()) : nullptr); trackSchedulersInValueIteration ? (trackingSchedulersInProvidedStorage ? player2Choices : &this->player2SchedulerChoices.get()) : nullptr);
// Determine whether the method converged. // Determine whether the method converged.
if (storm::utility::vector::equalModuloPrecision<ValueType>(*currentX, *newX, precision, relative)) { if (storm::utility::vector::equalModuloPrecision<ValueType>(*currentX, *newX, precision, relative)) {
status = Status::Converged;
status = SolverStatus::Converged;
} }
// Update environment variables. // Update environment variables.
@ -354,7 +352,7 @@ namespace storm {
clearCache(); clearCache();
} }
return (status == Status::Converged || status == Status::TerminatedEarly);
return (status == SolverStatus::Converged || status == SolverStatus::TerminatedEarly);
} }
template<typename ValueType> template<typename ValueType>
@ -562,23 +560,23 @@ namespace storm {
} }
template<typename ValueType> template<typename ValueType>
typename StandardGameSolver<ValueType>::Status StandardGameSolver<ValueType>::updateStatusIfNotConverged(Status status, std::vector<ValueType> const& x, uint64_t iterations, uint64_t maximalNumberOfIterations) const {
if (status != Status::Converged) {
SolverStatus StandardGameSolver<ValueType>::updateStatusIfNotConverged(SolverStatus status, std::vector<ValueType> const& x, uint64_t iterations, uint64_t maximalNumberOfIterations) const {
if (status != SolverStatus::Converged) {
if (this->hasCustomTerminationCondition() && this->getTerminationCondition().terminateNow(x)) { if (this->hasCustomTerminationCondition() && this->getTerminationCondition().terminateNow(x)) {
status = Status::TerminatedEarly;
status = SolverStatus::TerminatedEarly;
} else if (iterations >= maximalNumberOfIterations) { } else if (iterations >= maximalNumberOfIterations) {
status = Status::MaximalIterationsExceeded;
status = SolverStatus::MaximalIterationsExceeded;
} }
} }
return status; return status;
} }
template<typename ValueType> template<typename ValueType>
void StandardGameSolver<ValueType>::reportStatus(Status status, uint64_t iterations) const {
void StandardGameSolver<ValueType>::reportStatus(SolverStatus status, uint64_t iterations) const {
switch (status) { switch (status) {
case Status::Converged: STORM_LOG_INFO("Iterative solver converged after " << iterations << " iterations."); break;
case Status::TerminatedEarly: STORM_LOG_INFO("Iterative solver terminated early after " << iterations << " iterations."); break;
case Status::MaximalIterationsExceeded: STORM_LOG_WARN("Iterative solver did not converge after " << iterations << " iterations."); break;
case SolverStatus::Converged: STORM_LOG_INFO("Iterative solver converged after " << iterations << " iterations."); break;
case SolverStatus::TerminatedEarly: STORM_LOG_INFO("Iterative solver terminated early after " << iterations << " iterations."); break;
case SolverStatus::MaximalIterationsExceeded: STORM_LOG_WARN("Iterative solver did not converge after " << iterations << " iterations."); break;
default: default:
STORM_LOG_THROW(false, storm::exceptions::InvalidStateException, "Iterative solver terminated unexpectedly."); STORM_LOG_THROW(false, storm::exceptions::InvalidStateException, "Iterative solver terminated unexpectedly.");
} }

9
src/storm/solver/StandardGameSolver.h
View File

@ -3,6 +3,7 @@
#include "storm/solver/LinearEquationSolver.h" #include "storm/solver/LinearEquationSolver.h"
#include "storm/solver/Multiplier.h" #include "storm/solver/Multiplier.h"
#include "storm/solver/GameSolver.h" #include "storm/solver/GameSolver.h"
#include "storm/solver/SolverStatus.h"
#include "SolverSelectionOptions.h" #include "SolverSelectionOptions.h"
namespace storm { namespace storm {
@ -48,18 +49,14 @@ namespace storm {
uint64_t getNumberOfPlayer1States() const; uint64_t getNumberOfPlayer1States() const;
uint64_t getNumberOfPlayer2States() const; uint64_t getNumberOfPlayer2States() const;
enum class Status {
Converged, TerminatedEarly, MaximalIterationsExceeded, InProgress
};
// possibly cached data // possibly cached data
mutable std::unique_ptr<storm::solver::Multiplier<ValueType>> multiplierPlayer2Matrix; mutable std::unique_ptr<storm::solver::Multiplier<ValueType>> multiplierPlayer2Matrix;
mutable std::unique_ptr<std::vector<ValueType>> auxiliaryP2RowVector; // player2Matrix.rowCount() entries mutable std::unique_ptr<std::vector<ValueType>> auxiliaryP2RowVector; // player2Matrix.rowCount() entries
mutable std::unique_ptr<std::vector<ValueType>> auxiliaryP2RowGroupVector; // player2Matrix.rowGroupCount() entries mutable std::unique_ptr<std::vector<ValueType>> auxiliaryP2RowGroupVector; // player2Matrix.rowGroupCount() entries
mutable std::unique_ptr<std::vector<ValueType>> auxiliaryP1RowGroupVector; // player1Matrix.rowGroupCount() entries mutable std::unique_ptr<std::vector<ValueType>> auxiliaryP1RowGroupVector; // player1Matrix.rowGroupCount() entries
Status updateStatusIfNotConverged(Status status, std::vector<ValueType> const& x, uint64_t iterations, uint64_t maximalNumberOfIterations) const;
void reportStatus(Status status, uint64_t iterations) const;
SolverStatus updateStatusIfNotConverged(SolverStatus status, std::vector<ValueType> const& x, uint64_t iterations, uint64_t maximalNumberOfIterations) const;
void reportStatus(SolverStatus status, uint64_t iterations) const;
/// The factory used to obtain linear equation solvers. /// The factory used to obtain linear equation solvers.
std::unique_ptr<LinearEquationSolverFactory<ValueType>> linearEquationSolverFactory; std::unique_ptr<LinearEquationSolverFactory<ValueType>> linearEquationSolverFactory;

Write Preview
Loading…
Cancel
Save