From 0a59f7a7ef9d5b745250e9143dabd26c4de6d61b Mon Sep 17 00:00:00 2001 From: dehnert Date: Tue, 3 Feb 2015 13:03:29 +0100 Subject: [PATCH] Fixed a bug that sometimes prevented transition rewards from being built. Former-commit-id: afd56375abe84620508972511786ef9eafec2ed8 --- src/builder/ExplicitPrismModelBuilder.cpp | 2 +- src/storage/DeterministicModelBisimulationDecomposition.cpp | 2 +- src/storage/prism/TransitionReward.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/builder/ExplicitPrismModelBuilder.cpp b/src/builder/ExplicitPrismModelBuilder.cpp index 01d06cd11..48d21ba6e 100644 --- a/src/builder/ExplicitPrismModelBuilder.cpp +++ b/src/builder/ExplicitPrismModelBuilder.cpp @@ -220,7 +220,7 @@ namespace storm { int_fast64_t assignedValue = evaluator.asInt(assignmentIt->getExpression()); STORM_LOG_THROW(assignedValue <= integerIt->upperBound, storm::exceptions::WrongFormatException, "The update " << update << " leads to an out-of-bounds value (" << assignedValue << ") for the variable '" << assignmentIt->getVariableName() << "'."); newState.setFromInt(integerIt->bitOffset, integerIt->bitWidth, assignedValue - integerIt->lowerBound); - STORM_LOG_ASSERT(newState.getAsInt(integerIt->bitOffset, integerIt->bitWidth) == assignedValue, "Writing to the bit vector bucket failed."); + STORM_LOG_ASSERT(newState.getAsInt(integerIt->bitOffset, integerIt->bitWidth) + integerIt->lowerBound == assignedValue, "Writing to the bit vector bucket failed."); } // Check that we processed all assignments. diff --git a/src/storage/DeterministicModelBisimulationDecomposition.cpp b/src/storage/DeterministicModelBisimulationDecomposition.cpp index 08c11a2f2..81d4feec8 100644 --- a/src/storage/DeterministicModelBisimulationDecomposition.cpp +++ b/src/storage/DeterministicModelBisimulationDecomposition.cpp @@ -642,7 +642,7 @@ namespace storm { measureDrivenInitialPartition = true; } } else if (newFormula->isReachabilityRewardFormula()) { - rightSubformula = newFormula->asEventuallyFormula().getSubformula().asSharedPointer(); + rightSubformula = newFormula->asReachabilityRewardFormula().getSubformula().asSharedPointer(); if (rightSubformula->isPropositionalFormula()) { measureDrivenInitialPartition = true; } diff --git a/src/storage/prism/TransitionReward.cpp b/src/storage/prism/TransitionReward.cpp index 2fee8dabc..182fe43a1 100644 --- a/src/storage/prism/TransitionReward.cpp +++ b/src/storage/prism/TransitionReward.cpp @@ -2,7 +2,7 @@ namespace storm { namespace prism { - TransitionReward::TransitionReward(uint_fast64_t actionIndex, std::string const& actionName, storm::expressions::Expression const& statePredicateExpression, storm::expressions::Expression const& rewardValueExpression, std::string const& filename, uint_fast64_t lineNumber) : LocatedInformation(filename, lineNumber), actionName(actionName), labeled(actionName != ""), statePredicateExpression(statePredicateExpression), rewardValueExpression(rewardValueExpression) { + TransitionReward::TransitionReward(uint_fast64_t actionIndex, std::string const& actionName, storm::expressions::Expression const& statePredicateExpression, storm::expressions::Expression const& rewardValueExpression, std::string const& filename, uint_fast64_t lineNumber) : LocatedInformation(filename, lineNumber), actionIndex(actionIndex), actionName(actionName), labeled(actionName != ""), statePredicateExpression(statePredicateExpression), rewardValueExpression(rewardValueExpression) { // Nothing to do here. }