From a7bce9e520f8f44d326a80663d04ece42eeaa5be Mon Sep 17 00:00:00 2001 From: dehnert Date: Thu, 27 Nov 2014 18:21:51 +0100 Subject: [PATCH] Removed debug output and fixed the reward issue a bit more. Former-commit-id: ecbbeff14ef2b7fadf76ae74afdb8d11b44c80cd --- src/adapters/ExplicitModelAdapter.h | 3 +-- src/storage/prism/Program.cpp | 5 +++++ src/storage/prism/Program.h | 8 ++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/adapters/ExplicitModelAdapter.h b/src/adapters/ExplicitModelAdapter.h index 803f897a1..33d855af7 100644 --- a/src/adapters/ExplicitModelAdapter.h +++ b/src/adapters/ExplicitModelAdapter.h @@ -110,7 +110,7 @@ namespace storm { // all expressions in the program so we can then evaluate them without having to store the values of the // constants in the state (i.e., valuation). preparedProgram = preparedProgram.substituteConstants(); - storm::prism::RewardModel const& rewardModel = rewardModelName != "" ? preparedProgram.getRewardModel(rewardModelName) : storm::prism::RewardModel(); + storm::prism::RewardModel const& rewardModel = rewardModelName != "" || preparedProgram.hasRewardModel(rewardModelName) ? preparedProgram.getRewardModel(rewardModelName) : storm::prism::RewardModel(); ModelComponents modelComponents = buildModelComponents(preparedProgram, rewardModel); @@ -526,7 +526,6 @@ namespace storm { // Now add all rewards that match this choice. for (auto const& transitionReward : transitionRewards) { - std::cout << transitionReward.getStatePredicateExpression() << std::endl; if (transitionReward.getActionName() == "" && transitionReward.getStatePredicateExpression().evaluateAsBool(stateInformation.reachableStates.at(currentState))) { stateToRewardMap[stateProbabilityPair.first] += ValueType(transitionReward.getRewardValueExpression().evaluateAsDouble(stateInformation.reachableStates.at(currentState))); } diff --git a/src/storage/prism/Program.cpp b/src/storage/prism/Program.cpp index 5392a7949..00a2fca09 100644 --- a/src/storage/prism/Program.cpp +++ b/src/storage/prism/Program.cpp @@ -149,6 +149,11 @@ namespace storm { return !this->rewardModels.empty(); } + bool Program::hasRewardModel(std::string const& name) const { + auto const& nameIndexPair = this->rewardModelToIndexMap.find(name); + return nameIndexPair != this->rewardModelToIndexMap.end(); + } + std::vector const& Program::getRewardModels() const { return this->rewardModels; } diff --git a/src/storage/prism/Program.h b/src/storage/prism/Program.h index 56321600d..ad7777f85 100644 --- a/src/storage/prism/Program.h +++ b/src/storage/prism/Program.h @@ -226,6 +226,14 @@ namespace storm { */ bool hasRewardModel() const; + /*! + * Retrieves whether the program has a reward model with the given name. + * + * @param name The name of the reward model to look for. + * @return True iff the program has a reward model with the given name. + */ + bool hasRewardModel(std::string const& name) const; + /*! * Retrieves the reward models of the program. *