Browse Source

Renaming min upper aux method setting

tempestpy_adaptions
Jan Erik Karuc 5 years ago
parent
commit
bff888a97e
  1. 8
      src/storm/environment/solver/OviSolverEnvironment.cpp
  2. 4
      src/storm/environment/solver/OviSolverEnvironment.h
  3. 2
      src/storm/settings/modules/OviSolverSettings.cpp
  4. 2
      src/storm/settings/modules/OviSolverSettings.h

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

@ -14,7 +14,7 @@ namespace storm {
relevantValuesForPrecisionUpdate = oviSettings.useRelevantValuesForPrecisionUpdate(); relevantValuesForPrecisionUpdate = oviSettings.useRelevantValuesForPrecisionUpdate();
upperBoundGuessingFactor = storm::utility::convertNumber<storm::RationalNumber>(oviSettings.getUpperBoundGuessingFactor()); upperBoundGuessingFactor = storm::utility::convertNumber<storm::RationalNumber>(oviSettings.getUpperBoundGuessingFactor());
upperBoundOnlyIterations = oviSettings.getUpperBoundOnlyIterations(); upperBoundOnlyIterations = oviSettings.getUpperBoundOnlyIterations();
useTerminationGuaranteedMinimumMethod = oviSettings.getUseTerminationGuaranteedMinimumMethod();
terminationGuaranteedMinimumMethod = oviSettings.useTerminationGuaranteedMinimumMethod();
} }
OviSolverEnvironment::~OviSolverEnvironment() { OviSolverEnvironment::~OviSolverEnvironment() {
@ -34,15 +34,15 @@ namespace storm {
} }
storm::RationalNumber OviSolverEnvironment::getUpperBoundGuessingFactor() const { storm::RationalNumber OviSolverEnvironment::getUpperBoundGuessingFactor() const {
return maxVerificationIterationFactor;
return upperBoundGuessingFactor;
} }
uint64_t OviSolverEnvironment::getUpperBoundOnlyIterations() const { uint64_t OviSolverEnvironment::getUpperBoundOnlyIterations() const {
return upperBoundOnlyIterations; return upperBoundOnlyIterations;
} }
bool OviSolverEnvironment::getUseTerminationGuaranteedMinimumMethod() const {
return useTerminationGuaranteedMinimumMethod;
bool OviSolverEnvironment::useTerminationGuaranteedMinimumMethod() const {
return terminationGuaranteedMinimumMethod;
} }
} }

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

@ -17,7 +17,7 @@ namespace storm {
bool useRelevantValuesForPrecisionUpdate() const; bool useRelevantValuesForPrecisionUpdate() const;
storm::RationalNumber getUpperBoundGuessingFactor() const; storm::RationalNumber getUpperBoundGuessingFactor() const;
uint64_t getUpperBoundOnlyIterations() const; uint64_t getUpperBoundOnlyIterations() const;
bool getUseTerminationGuaranteedMinimumMethod() const;
bool useTerminationGuaranteedMinimumMethod() const;
private: private:
storm::RationalNumber precisionUpdateFactor; storm::RationalNumber precisionUpdateFactor;
@ -25,7 +25,7 @@ namespace storm {
bool relevantValuesForPrecisionUpdate; bool relevantValuesForPrecisionUpdate;
storm::RationalNumber upperBoundGuessingFactor; storm::RationalNumber upperBoundGuessingFactor;
uint64_t upperBoundOnlyIterations; uint64_t upperBoundOnlyIterations;
bool useTerminationGuaranteedMinimumMethod;
bool terminationGuaranteedMinimumMethod;
}; };
} }

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

@ -54,7 +54,7 @@ namespace storm {
return this->getOption(upperBoundOnlyIterationsOptionName).getArgumentByName("iter").getValueAsInteger(); return this->getOption(upperBoundOnlyIterationsOptionName).getArgumentByName("iter").getValueAsInteger();
} }
bool OviSolverSettings::getUseTerminationGuaranteedMinimumMethod() const {
bool OviSolverSettings::useTerminationGuaranteedMinimumMethod() const {
return this->getOption(useTerminationGuaranteedMinimumMethodOptionName).getHasOptionBeenSet(); return this->getOption(useTerminationGuaranteedMinimumMethodOptionName).getHasOptionBeenSet();
} }

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

@ -25,7 +25,7 @@ namespace storm {
uint64_t getUpperBoundOnlyIterations() const; uint64_t getUpperBoundOnlyIterations() const;
bool getUseTerminationGuaranteedMinimumMethod() const;
bool useTerminationGuaranteedMinimumMethod() const;
// The name of the module. // The name of the module.
static const std::string moduleName; static const std::string moduleName;

Loading…
Cancel
Save