diff --git a/src/storm/environment/solver/MinMaxSolverEnvironment.cpp b/src/storm/environment/solver/MinMaxSolverEnvironment.cpp index d9e43c2e2..ada4cc5da 100644 --- a/src/storm/environment/solver/MinMaxSolverEnvironment.cpp +++ b/src/storm/environment/solver/MinMaxSolverEnvironment.cpp @@ -19,8 +19,6 @@ namespace storm { multiplicationStyle = minMaxSettings.getValueIterationMultiplicationStyle(); forceBounds = minMaxSettings.isForceBoundsSet(); symmetricUpdates = minMaxSettings.isForceIntervalIterationSymmetricUpdatesSet(); - qviRestartThreshold = minMaxSettings.getQviRestartThreshold(); - qviRestartMaxIterations = minMaxSettings.getQviRestartMaxIterations(); } MinMaxSolverEnvironment::~MinMaxSolverEnvironment() { @@ -88,22 +86,4 @@ namespace storm { symmetricUpdates = value; } - storm::RationalNumber MinMaxSolverEnvironment::getQviRestartThreshold() const { - return qviRestartThreshold; - } - - void MinMaxSolverEnvironment::setQviRestartThreshold(storm::RationalNumber value) { - qviRestartThreshold = value; - } - - uint64_t MinMaxSolverEnvironment::getQviRestartMaxIterations() const { - return qviRestartMaxIterations; - } - - void MinMaxSolverEnvironment::setQviRestartMaxIterations(uint64_t value) { - qviRestartMaxIterations = value; - } - - - } diff --git a/src/storm/environment/solver/MinMaxSolverEnvironment.h b/src/storm/environment/solver/MinMaxSolverEnvironment.h index 6196942a1..3f54f0fa9 100644 --- a/src/storm/environment/solver/MinMaxSolverEnvironment.h +++ b/src/storm/environment/solver/MinMaxSolverEnvironment.h @@ -29,10 +29,6 @@ namespace storm { void setForceBounds(bool value); bool isSymmetricUpdatesSet() const; void setSymmetricUpdates(bool value); - storm::RationalNumber getQviRestartThreshold() const; - void setQviRestartThreshold(storm::RationalNumber value); - uint64_t getQviRestartMaxIterations() const; - void setQviRestartMaxIterations(uint64_t value); private: storm::solver::MinMaxMethod minMaxMethod; @@ -43,8 +39,6 @@ namespace storm { storm::solver::MultiplicationStyle multiplicationStyle; bool forceBounds; bool symmetricUpdates; - storm::RationalNumber qviRestartThreshold; - uint64_t qviRestartMaxIterations; }; } diff --git a/src/storm/settings/modules/MinMaxEquationSolverSettings.cpp b/src/storm/settings/modules/MinMaxEquationSolverSettings.cpp index f918fe112..7612f16ec 100644 --- a/src/storm/settings/modules/MinMaxEquationSolverSettings.cpp +++ b/src/storm/settings/modules/MinMaxEquationSolverSettings.cpp @@ -21,7 +21,6 @@ namespace storm { const std::string MinMaxEquationSolverSettings::valueIterationMultiplicationStyleOptionName = "vimult"; const std::string MinMaxEquationSolverSettings::intervalIterationSymmetricUpdatesOptionName = "symmetricupdates"; const std::string MinMaxEquationSolverSettings::forceBoundsOptionName = "forcebounds"; - const std::string MinMaxEquationSolverSettings::quickValueIterationRestartOptionName = "qvirestart"; MinMaxEquationSolverSettings::MinMaxEquationSolverSettings() : ModuleSettings(moduleName) { std::vector minMaxSolvingTechniques = {"vi", "value-iteration", "pi", "policy-iteration", "linear-programming", "lp", "ratsearch", "qvi", "quick-value-iteration", "topological"}; @@ -46,9 +45,6 @@ namespace storm { this->addOption(storm::settings::OptionBuilder(moduleName, forceBoundsOptionName, false, "If set, minmax solver always require that a priori bounds for the solution are computed.").build()); - this->addOption(storm::settings::OptionBuilder(moduleName, quickValueIterationRestartOptionName, false, "Controls when a restart of quick value iteration is triggered.") - .addArgument(storm::settings::ArgumentBuilder::createDoubleArgument("threshold", "The minimal (relative) bound improvement that triggers a restart").addValidatorDouble(ArgumentValidatorFactory::createDoubleRangeValidatorIncluding(0.0, 1.0)).setDefaultValueDouble(0.5).build()) - .addArgument(storm::settings::ArgumentBuilder::createUnsignedIntegerArgument("maxiters", "The maximal number of iterations within which a restart can be triggered.").setDefaultValueUnsignedInteger(300).build()).build()); } storm::solver::MinMaxMethod MinMaxEquationSolverSettings::getMinMaxEquationSolvingMethod() const { @@ -128,15 +124,6 @@ namespace storm { bool MinMaxEquationSolverSettings::isForceBoundsSet() const { return this->getOption(forceBoundsOptionName).getHasOptionBeenSet(); } - - double MinMaxEquationSolverSettings::getQviRestartThreshold() const { - return this->getOption(quickValueIterationRestartOptionName).getArgumentByName("threshold").getValueAsDouble(); - } - - uint_fast64_t MinMaxEquationSolverSettings::getQviRestartMaxIterations() const { - return this->getOption(quickValueIterationRestartOptionName).getArgumentByName("maxiters").getValueAsUnsignedInteger(); - } - } } } diff --git a/src/storm/settings/modules/MinMaxEquationSolverSettings.h b/src/storm/settings/modules/MinMaxEquationSolverSettings.h index 02be37d00..fc5add0c4 100644 --- a/src/storm/settings/modules/MinMaxEquationSolverSettings.h +++ b/src/storm/settings/modules/MinMaxEquationSolverSettings.h @@ -107,16 +107,6 @@ namespace storm { */ bool isForceBoundsSet() const; - /*! - * Retrieves the restart threshold for quick value iteration - */ - double getQviRestartThreshold() const; - - /*! - * Retrieves the maximal number of iterations within which a restart of quick value iteration can be triggered. - */ - uint_fast64_t getQviRestartMaxIterations() const; - // The name of the module. static const std::string moduleName;