Browse Source

fixed policy iteration on MTBDDs

tempestpy_adaptions
dehnert 7 years ago
parent
commit
acde9f571f
  1. 12
      src/storm/solver/SymbolicMinMaxLinearEquationSolver.cpp

12
src/storm/solver/SymbolicMinMaxLinearEquationSolver.cpp

@ -320,6 +320,7 @@ namespace storm {
if (solver.getEquationProblemFormat() == storm::solver::LinearEquationSolverProblemFormat::EquationSystem) { if (solver.getEquationProblemFormat() == storm::solver::LinearEquationSolverProblemFormat::EquationSystem) {
schedulerA = diagonal - schedulerA; schedulerA = diagonal - schedulerA;
} }
storm::dd::Add<DdType, ValueType> schedulerB = scheduler.ite(b, scheduler.getDdManager().template getAddZero<ValueType>()).sumAbstract(this->choiceVariables); storm::dd::Add<DdType, ValueType> schedulerB = scheduler.ite(b, scheduler.getDdManager().template getAddZero<ValueType>()).sumAbstract(this->choiceVariables);
// Set the matrix for the solver. // Set the matrix for the solver.
@ -356,9 +357,16 @@ namespace storm {
storm::dd::Bdd<DdType> nextScheduler; storm::dd::Bdd<DdType> nextScheduler;
if (dir == storm::solver::OptimizationDirection::Minimize) { if (dir == storm::solver::OptimizationDirection::Minimize) {
choiceValues += illegalMaskAdd; choiceValues += illegalMaskAdd;
nextScheduler = choiceValues.minAbstractRepresentative(this->choiceVariables);
storm::dd::Add<DdType, ValueType> newStateValues = choiceValues.minAbstract(this->choiceVariables);
storm::dd::Bdd<DdType> improvedStates = newStateValues.less(schedulerX);
nextScheduler = improvedStates.ite(choiceValues.minAbstractRepresentative(this->choiceVariables), scheduler);
} else { } else {
nextScheduler = choiceValues.maxAbstractRepresentative(this->choiceVariables);
storm::dd::Add<DdType, ValueType> newStateValues = choiceValues.maxAbstract(this->choiceVariables);
storm::dd::Bdd<DdType> improvedStates = newStateValues.greater(schedulerX);
nextScheduler = improvedStates.ite(choiceValues.maxAbstractRepresentative(this->choiceVariables), scheduler);
} }
// Check for convergence. // Check for convergence.

Loading…
Cancel
Save