diff --git a/src/modelchecker/prctl/helper/MDPModelCheckingHelperReturnType.h b/src/modelchecker/prctl/helper/MDPModelCheckingHelperReturnType.h index d04dd1988..a68a5889e 100644 --- a/src/modelchecker/prctl/helper/MDPModelCheckingHelperReturnType.h +++ b/src/modelchecker/prctl/helper/MDPModelCheckingHelperReturnType.h @@ -3,7 +3,7 @@ #include #include -#include "src/storage/partialscheduler.h" +#include "src/storage/PartialScheduler.h" namespace storm { namespace storage { diff --git a/src/permissivesched/MILPPermissiveSchedulers.h b/src/permissivesched/MILPPermissiveSchedulers.h index 7f0e7c5b9..d25179225 100644 --- a/src/permissivesched/MILPPermissiveSchedulers.h +++ b/src/permissivesched/MILPPermissiveSchedulers.h @@ -187,7 +187,7 @@ class MilpPermissiveSchedulerComputation : public PermissiveSchedulerComputation createConstraints(boundary, relevantStates); - solver.setModelSense(storm::solver::LpSolver::ModelSense::Minimize); + solver.setOptimizationDirection(storm::OptimizationDirection::Minimize); } }; diff --git a/src/permissivesched/PermissiveSchedulers.cpp b/src/permissivesched/PermissiveSchedulers.cpp index 231d4ba14..53f1039a8 100644 --- a/src/permissivesched/PermissiveSchedulers.cpp +++ b/src/permissivesched/PermissiveSchedulers.cpp @@ -11,7 +11,7 @@ namespace storm { namespace ps { boost::optional computePermissiveSchedulerViaMILP(std::shared_ptr> mdp, storm::logic::ProbabilityOperatorFormula const& safeProp) { - storm::modelchecker::SparsePropositionalModelChecker propMC(*mdp); + storm::modelchecker::SparsePropositionalModelChecker> propMC(*mdp); assert(safeProp.getSubformula().isEventuallyFormula()); auto backwardTransitions = mdp->getBackwardTransitions(); storm::storage::BitVector goalstates = propMC.check(safeProp.getSubformula().asEventuallyFormula().getSubformula())->asExplicitQualitativeCheckResult().getTruthValuesVector(); @@ -31,5 +31,9 @@ namespace storm { boost::optional computePermissiveSchedulerViaMC(std::shared_ptr> mdp, storm::logic::ProbabilityOperatorFormula const& safeProp) { } + + boost::optional computerPermissiveSchedulerViaSMT(std::shared_ptr> mdp, storm::logic::ProbabilityOperatorFormula const& safeProp) { + + } } } diff --git a/test/functional/permissiveschedulers/MilpPermissiveSchedulerTest.cpp b/test/functional/permissiveschedulers/MilpPermissiveSchedulerTest.cpp index a66a6f693..ad300df32 100644 --- a/test/functional/permissiveschedulers/MilpPermissiveSchedulerTest.cpp +++ b/test/functional/permissiveschedulers/MilpPermissiveSchedulerTest.cpp @@ -11,7 +11,7 @@ TEST(MilpPermissiveSchedulerTest, DieSelection) { storm::prism::Program program = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/die_selection.nm"); storm::parser::FormulaParser formulaParser(program.getManager().getSharedPointer()); std::cout << " We are now here " << std::endl; - auto formula = formulaParser.parseFromString("P<=0.2 [ F \"one\"]")->asProbabilityOperatorFormula(); + auto formula = formulaParser.parseSingleFormulaFromString("P<=0.2 [ F \"one\"]")->asProbabilityOperatorFormula(); std::cout << formula << std::endl; // Customize and perform model-building. @@ -19,7 +19,6 @@ TEST(MilpPermissiveSchedulerTest, DieSelection) { options = typename storm::builder::ExplicitPrismModelBuilder::Options(formula); options.addConstantDefinitionsFromString(program, ""); - options.buildRewards = false; options.buildCommandLabels = true; std::shared_ptr> mdp = storm::builder::ExplicitPrismModelBuilder::translateProgram(program, options)->as>();