Browse Source

Minimal progress on perm schedulers

Former-commit-id: 9ea6756c6a
tempestpy_adaptions
sjunges 9 years ago
parent
commit
7d9cc8e905
  1. 0
      src/permissivesched/MCPermissiveSchedulers.h
  2. 4
      src/permissivesched/MILPPermissiveSchedulers.h
  3. 4
      src/permissivesched/PermissiveSchedulers.cpp

0
src/permissivesched/MCPermissiveSchedulers.h

4
src/permissivesched/MILPPermissiveSchedulers.h

@ -163,7 +163,9 @@ class MilpPermissiveSchedulerComputation : public PermissiveSchedulerComputation
assert(mGammaVariables.count(entry.getColumn()) > 0);
assert(mGammaVariables.count(s) > 0);
assert(mBetaVariables.count(sat) > 0);
solver.addConstraint("c8-" + satstring, mGammaVariables[entry.getColumn()] < mGammaVariables[s] + (solver.getConstant(1) - mBetaVariables[sat]) + mProbVariables[s]); // With rewards, we have to change this.
if(relevantStates[entry.getColumn()]) {
solver.addConstraint("c8-" + satstring, mGammaVariables[entry.getColumn()] < mGammaVariables[s] + (solver.getConstant(1) - mBetaVariables[sat]) + mProbVariables[s]); // With rewards, we have to change this.
}
}
}

4
src/permissivesched/PermissiveSchedulers.cpp

@ -27,5 +27,9 @@ namespace storm {
return boost::optional<MemorylessDeterministicPermissiveScheduler>(comp.getScheduler());
}
}
boost::optional<MemorylessDeterministicPermissiveScheduler> computePermissiveSchedulerViaMC(std::shared_ptr<storm::models::sparse::Mdp<double>> mdp, storm::logic::ProbabilityOperatorFormula const& safeProp) {
}
}
}
Loading…
Cancel
Save