Browse Source

ovi: removed unused option for only taking relevant values when updating the precision

tempestpy_adaptions
Tim Quatmann 4 years ago
parent
commit
c5f698f9f7
  1. 5
      src/storm/environment/solver/OviSolverEnvironment.cpp
  2. 2
      src/storm/environment/solver/OviSolverEnvironment.h
  3. 6
      src/storm/settings/modules/OviSolverSettings.cpp
  4. 3
      src/storm/settings/modules/OviSolverSettings.h

5
src/storm/environment/solver/OviSolverEnvironment.cpp

@ -11,7 +11,6 @@ namespace storm {
auto const& oviSettings = storm::settings::getModule<storm::settings::modules::OviSolverSettings>();
precisionUpdateFactor = storm::utility::convertNumber<storm::RationalNumber>(oviSettings.getPrecisionUpdateFactor());
maxVerificationIterationFactor = storm::utility::convertNumber<storm::RationalNumber>(oviSettings.getMaxVerificationIterationFactor());
relevantValuesForPrecisionUpdate = oviSettings.useRelevantValuesForPrecisionUpdate();
upperBoundGuessingFactor = storm::utility::convertNumber<storm::RationalNumber>(oviSettings.getUpperBoundGuessingFactor());
upperBoundOnlyIterations = oviSettings.getUpperBoundOnlyIterations();
noTerminationGuaranteeMinimumMethod = oviSettings.useNoTerminationGuaranteeMinimumMethod();
@ -29,10 +28,6 @@ namespace storm {
return maxVerificationIterationFactor;
}
bool OviSolverEnvironment::useRelevantValuesForPrecisionUpdate() const {
return relevantValuesForPrecisionUpdate;
}
storm::RationalNumber OviSolverEnvironment::getUpperBoundGuessingFactor() const {
return upperBoundGuessingFactor;
}

2
src/storm/environment/solver/OviSolverEnvironment.h

@ -14,7 +14,6 @@ namespace storm {
storm::RationalNumber getPrecisionUpdateFactor() const;
storm::RationalNumber getMaxVerificationIterationFactor() const;
bool useRelevantValuesForPrecisionUpdate() const;
storm::RationalNumber getUpperBoundGuessingFactor() const;
uint64_t getUpperBoundOnlyIterations() const;
bool useNoTerminationGuaranteeMinimumMethod() const;
@ -22,7 +21,6 @@ namespace storm {
private:
storm::RationalNumber precisionUpdateFactor;
storm::RationalNumber maxVerificationIterationFactor;
bool relevantValuesForPrecisionUpdate;
storm::RationalNumber upperBoundGuessingFactor;
uint64_t upperBoundOnlyIterations;
bool noTerminationGuaranteeMinimumMethod;

6
src/storm/settings/modules/OviSolverSettings.cpp

@ -23,8 +23,6 @@ namespace storm {
this->addOption(storm::settings::OptionBuilder(moduleName, precisionUpdateFactorOptionName, false, "Sets with which factor the precision of the inner value iteration is updated.").setIsAdvanced().addArgument(storm::settings::ArgumentBuilder::createDoubleArgument("factor", "The factor.").setDefaultValueDouble(0.4).addValidatorDouble(ArgumentValidatorFactory::createDoubleRangeValidatorExcluding(0.0, 1.0)).build()).build());
this->addOption(storm::settings::OptionBuilder(moduleName, useRelevantValuesForPrecisionUpdateOptionName, false, "Sets whether the precision of the inner value iteration is only based on the relevant values (i.e. initial states).").setIsAdvanced().build());
this->addOption(storm::settings::OptionBuilder(moduleName, maxVerificationIterationFactorOptionName, false, "Controls how many verification iterations are performed before guessing a new upper bound.").setIsAdvanced().addArgument(storm::settings::ArgumentBuilder::createDoubleArgument("factor", "The factor.").setDefaultValueDouble(1.0).addValidatorDouble(ArgumentValidatorFactory::createDoubleGreaterValidator(0.0)).build()).build());
this->addOption(storm::settings::OptionBuilder(moduleName, upperBoundGuessingFactorOptionName, false, "Sets with which factor the precision is multiplied to guess the upper bound.").setIsAdvanced().addArgument(storm::settings::ArgumentBuilder::createDoubleArgument("factor", "The factor.").setDefaultValueDouble(1.0).addValidatorDouble(ArgumentValidatorFactory::createDoubleGreaterValidator(0.0)).build()).build());
@ -42,10 +40,6 @@ namespace storm {
return this->getOption(maxVerificationIterationFactorOptionName).getArgumentByName("factor").getValueAsDouble();
}
bool OviSolverSettings::useRelevantValuesForPrecisionUpdate() const {
return this->getOption(useRelevantValuesForPrecisionUpdateOptionName).getHasOptionBeenSet();
}
double OviSolverSettings::getUpperBoundGuessingFactor() const {
return this->getOption(upperBoundGuessingFactorOptionName).getArgumentByName("factor").getValueAsDouble();
}

3
src/storm/settings/modules/OviSolverSettings.h

@ -19,8 +19,6 @@ namespace storm {
double getMaxVerificationIterationFactor() const;
bool useRelevantValuesForPrecisionUpdate() const;
double getUpperBoundGuessingFactor() const;
uint64_t getUpperBoundOnlyIterations() const;
@ -33,7 +31,6 @@ namespace storm {
private:
static const std::string precisionUpdateFactorOptionName;
static const std::string maxVerificationIterationFactorOptionName;
static const std::string useRelevantValuesForPrecisionUpdateOptionName;
static const std::string upperBoundGuessingFactorOptionName;
static const std::string upperBoundOnlyIterationsOptionName;
static const std::string useNoTerminationGuaranteeMinimumMethodOptionName;

Loading…
Cancel
Save