From 9593ba5a7f24477e6787d6f0dbeeee76be3acab1 Mon Sep 17 00:00:00 2001 From: sjunges Date: Fri, 2 Oct 2015 10:37:01 +0200 Subject: [PATCH] better output in perm schedulers Former-commit-id: 2a33124c7c8e8e452a94e34ea3585edbeccd3ce2 --- src/permissivesched/MILPPermissiveSchedulers.h | 3 ++- src/permissivesched/PermissiveSchedulerPenalty.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/permissivesched/MILPPermissiveSchedulers.h b/src/permissivesched/MILPPermissiveSchedulers.h index 5b3bd5c91..9c2549127 100644 --- a/src/permissivesched/MILPPermissiveSchedulers.h +++ b/src/permissivesched/MILPPermissiveSchedulers.h @@ -42,8 +42,9 @@ class MilpPermissiveSchedulerComputation : public PermissiveSchedulerComputation void calculatePermissiveScheduler(bool lowerBound, double boundary) override { createMILP(lowerBound, boundary, this->mPenalties); + //STORM_LOG_DEBUG("Calling optimizer"); solver.optimize(); - + //STORM_LOG_DEBUG("Done optimizing.") mCalledOptimizer = true; } diff --git a/src/permissivesched/PermissiveSchedulerPenalty.h b/src/permissivesched/PermissiveSchedulerPenalty.h index bb680defa..66f75cea2 100644 --- a/src/permissivesched/PermissiveSchedulerPenalty.h +++ b/src/permissivesched/PermissiveSchedulerPenalty.h @@ -22,7 +22,7 @@ namespace storm { double get(storage::StateActionPair const& sap) const { auto it = mPenalties.find(sap); if(it == mPenalties.end()) { - return 1.0; + return 0.0; } else { return it->second;