From ee5fff680a917c0c3c0b297f01cecdf294312755 Mon Sep 17 00:00:00 2001
From: Tim Quatmann <tim.quatmann@cs.rwth-aachen.de>
Date: Fri, 20 Nov 2020 10:35:02 +0100
Subject: [PATCH] Indefinite Horizon helpers: Do not compute values of
MaybeStates if they are not relevant for the property. (Fixes #87)
---
.../prctl/helper/SparseDtmcPrctlHelper.cpp | 10 ++++++++--
.../modelchecker/prctl/helper/SparseMdpPrctlHelper.cpp | 10 ++++++++--
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/storm/modelchecker/prctl/helper/SparseDtmcPrctlHelper.cpp b/src/storm/modelchecker/prctl/helper/SparseDtmcPrctlHelper.cpp
index 683099542..f17f0cd27 100644
--- a/src/storm/modelchecker/prctl/helper/SparseDtmcPrctlHelper.cpp
+++ b/src/storm/modelchecker/prctl/helper/SparseDtmcPrctlHelper.cpp
@@ -176,8 +176,11 @@ namespace storm {
storm::utility::vector::setVectorValues<ValueType>(result, statesWithProbability1, storm::utility::one<ValueType>());
}
+ // Check if the values of the maybe states are relevant for the SolveGoal
+ bool maybeStatesNotRelevant = goal.hasRelevantValues() && goal.relevantValues().isDisjointFrom(maybeStates);
+
// Check whether we need to compute exact probabilities for some states.
- if (qualitative) {
+ if (qualitative || maybeStatesNotRelevant) {
// Set the values for all maybe-states to 0.5 to indicate that their probability values are neither 0 nor 1.
storm::utility::vector::setVectorValues<ValueType>(result, maybeStates, storm::utility::convertNumber<ValueType>(0.5));
} else {
@@ -434,8 +437,11 @@ namespace storm {
storm::utility::vector::setVectorValues(result, infinityStates, storm::utility::infinity<ValueType>());
}
+ // Check if the values of the maybe states are relevant for the SolveGoal
+ bool maybeStatesNotRelevant = goal.hasRelevantValues() && goal.relevantValues().isDisjointFrom(maybeStates);
+
// Check whether we need to compute exact rewards for some states.
- if (qualitative) {
+ if (qualitative || maybeStatesNotRelevant) {
// Set the values for all maybe-states to 1 to indicate that their reward values
// are neither 0 nor infinity.
storm::utility::vector::setVectorValues<ValueType>(result, maybeStates, storm::utility::one<ValueType>());
diff --git a/src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.cpp b/src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.cpp
index 38a84bd48..eb63176c6 100644
--- a/src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.cpp
+++ b/src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.cpp
@@ -606,8 +606,11 @@ namespace storm {
scheduler = std::make_unique<storm::storage::Scheduler<ValueType>>(transitionMatrix.getRowGroupCount());
}
+ // Check if the values of the maybe states are relevant for the SolveGoal
+ bool maybeStatesNotRelevant = goal.hasRelevantValues() && goal.relevantValues().isDisjointFrom(qualitativeStateSets.maybeStates);
+
// Check whether we need to compute exact probabilities for some states.
- if (qualitative) {
+ if (qualitative || maybeStatesNotRelevant) {
// Set the values for all maybe-states to 0.5 to indicate that their probability values are neither 0 nor 1.
storm::utility::vector::setVectorValues<ValueType>(result, qualitativeStateSets.maybeStates, storm::utility::convertNumber<ValueType>(0.5));
} else {
@@ -1091,8 +1094,11 @@ namespace storm {
scheduler = std::make_unique<storm::storage::Scheduler<ValueType>>(transitionMatrix.getRowGroupCount());
}
+ // Check if the values of the maybe states are relevant for the SolveGoal
+ bool maybeStatesNotRelevant = goal.hasRelevantValues() && goal.relevantValues().isDisjointFrom(qualitativeStateSets.maybeStates);
+
// Check whether we need to compute exact rewards for some states.
- if (qualitative) {
+ if (qualitative || maybeStatesNotRelevant) {
STORM_LOG_INFO("The rewards for the initial states were determined in a preprocessing step. No exact rewards were computed.");
// Set the values for all maybe-states to 1 to indicate that their reward values
// are neither 0 nor infinity.