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

MaTest: Making sure that the 'inner' MinMax solver for unif+ is allowed to switch the solution method.

tempestpy_adaptions
Tim Quatmann 5 years ago
parent
e54a035ab9
commit
4a34fb1a7c
1 changed files with 7 additions and 7 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. 14
      src/test/storm/modelchecker/csl/MarkovAutomatonCslModelCheckerTest.cpp

14
src/test/storm/modelchecker/csl/MarkovAutomatonCslModelCheckerTest.cpp
View File

@ -40,7 +40,7 @@ namespace {
typedef storm::models::sparse::MarkovAutomaton<ValueType> ModelType; typedef storm::models::sparse::MarkovAutomaton<ValueType> ModelType;
static storm::Environment createEnvironment() { static storm::Environment createEnvironment() {
storm::Environment env; storm::Environment env;
env.solver().minMax().setMethod(storm::solver::MinMaxMethod::ValueIteration);
env.solver().minMax().setMethod(storm::solver::MinMaxMethod::ValueIteration, true);
env.solver().minMax().setPrecision(storm::utility::convertNumber<storm::RationalNumber>(1e-10)); env.solver().minMax().setPrecision(storm::utility::convertNumber<storm::RationalNumber>(1e-10));
return env; return env;
} }
@ -54,7 +54,7 @@ namespace {
typedef storm::models::sparse::MarkovAutomaton<ValueType> ModelType; typedef storm::models::sparse::MarkovAutomaton<ValueType> ModelType;
static storm::Environment createEnvironment() { static storm::Environment createEnvironment() {
storm::Environment env; storm::Environment env;
env.solver().minMax().setMethod(storm::solver::MinMaxMethod::ValueIteration);
env.solver().minMax().setMethod(storm::solver::MinMaxMethod::ValueIteration, true);
env.solver().minMax().setPrecision(storm::utility::convertNumber<storm::RationalNumber>(1e-10)); env.solver().minMax().setPrecision(storm::utility::convertNumber<storm::RationalNumber>(1e-10));
return env; return env;
} }
@ -68,7 +68,7 @@ namespace {
typedef storm::models::sparse::MarkovAutomaton<ValueType> ModelType; typedef storm::models::sparse::MarkovAutomaton<ValueType> ModelType;
static storm::Environment createEnvironment() { static storm::Environment createEnvironment() {
storm::Environment env; storm::Environment env;
env.solver().minMax().setMethod(storm::solver::MinMaxMethod::ValueIteration);
env.solver().minMax().setMethod(storm::solver::MinMaxMethod::ValueIteration, true);
env.solver().minMax().setPrecision(storm::utility::convertNumber<storm::RationalNumber>(1e-10)); env.solver().minMax().setPrecision(storm::utility::convertNumber<storm::RationalNumber>(1e-10));
return env; return env;
} }
@ -82,7 +82,7 @@ namespace {
typedef storm::models::symbolic::MarkovAutomaton<ddType, ValueType> ModelType; typedef storm::models::symbolic::MarkovAutomaton<ddType, ValueType> ModelType;
static storm::Environment createEnvironment() { static storm::Environment createEnvironment() {
storm::Environment env; storm::Environment env;
env.solver().minMax().setMethod(storm::solver::MinMaxMethod::ValueIteration);
env.solver().minMax().setMethod(storm::solver::MinMaxMethod::ValueIteration, true);
env.solver().minMax().setPrecision(storm::utility::convertNumber<storm::RationalNumber>(1e-10)); env.solver().minMax().setPrecision(storm::utility::convertNumber<storm::RationalNumber>(1e-10));
return env; return env;
} }
@ -97,7 +97,7 @@ namespace {
static storm::Environment createEnvironment() { static storm::Environment createEnvironment() {
storm::Environment env; storm::Environment env;
env.solver().setForceSoundness(true); env.solver().setForceSoundness(true);
env.solver().minMax().setMethod(storm::solver::MinMaxMethod::IntervalIteration);
env.solver().minMax().setMethod(storm::solver::MinMaxMethod::IntervalIteration, true);
env.solver().minMax().setPrecision(storm::utility::convertNumber<storm::RationalNumber>(1e-6)); env.solver().minMax().setPrecision(storm::utility::convertNumber<storm::RationalNumber>(1e-6));
env.solver().minMax().setRelativeTerminationCriterion(false); env.solver().minMax().setRelativeTerminationCriterion(false);
return env; return env;
@ -112,7 +112,7 @@ namespace {
typedef storm::models::sparse::MarkovAutomaton<ValueType> ModelType; typedef storm::models::sparse::MarkovAutomaton<ValueType> ModelType;
static storm::Environment createEnvironment() { static storm::Environment createEnvironment() {
storm::Environment env; storm::Environment env;
env.solver().minMax().setMethod(storm::solver::MinMaxMethod::PolicyIteration);
env.solver().minMax().setMethod(storm::solver::MinMaxMethod::PolicyIteration, true);
return env; return env;
} }
}; };
@ -125,7 +125,7 @@ namespace {
typedef storm::models::sparse::MarkovAutomaton<ValueType> ModelType; typedef storm::models::sparse::MarkovAutomaton<ValueType> ModelType;
static storm::Environment createEnvironment() { static storm::Environment createEnvironment() {
storm::Environment env; storm::Environment env;
env.solver().minMax().setMethod(storm::solver::MinMaxMethod::RationalSearch);
env.solver().minMax().setMethod(storm::solver::MinMaxMethod::RationalSearch, true);
return env; return env;
} }
}; };

Write Preview
Loading…
Cancel
Save