From c614e9d74720d6000a69afa9da2b2279b355db94 Mon Sep 17 00:00:00 2001 From: TimQu Date: Thu, 29 Nov 2018 18:57:45 +0100 Subject: [PATCH] Fixed Value Iteration based LRA computation --- .../csl/helper/SparseMarkovAutomatonCslHelper.cpp | 2 +- src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/storm/modelchecker/csl/helper/SparseMarkovAutomatonCslHelper.cpp b/src/storm/modelchecker/csl/helper/SparseMarkovAutomatonCslHelper.cpp index b390327c0..d6e7e5a7e 100644 --- a/src/storm/modelchecker/csl/helper/SparseMarkovAutomatonCslHelper.cpp +++ b/src/storm/modelchecker/csl/helper/SparseMarkovAutomatonCslHelper.cpp @@ -1030,7 +1030,7 @@ namespace storm { } // Check for convergence - if (maxDiff - minDiff <= relative ? (precision * minDiff) : precision) { + if ((maxDiff - minDiff) <= (relative ? (precision * minDiff) : precision)) { break; } diff --git a/src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.cpp b/src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.cpp index 310360ac5..0a0ea992c 100644 --- a/src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.cpp +++ b/src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.cpp @@ -1572,7 +1572,7 @@ namespace storm { STORM_LOG_ASSERT(mecTransitions.isProbabilistic(), "The MEC-Matrix is not probabilistic."); // start the iterations - ValueType precision = storm::utility::convertNumber(env.solver().minMax().getPrecision()); + ValueType precision = storm::utility::convertNumber(env.solver().minMax().getPrecision()) / scalingFactor; bool relative = env.solver().minMax().getRelativeTerminationCriterion(); std::vector x(mecTransitions.getRowGroupCount(), storm::utility::zero()); std::vector xPrime = x; @@ -1600,7 +1600,7 @@ namespace storm { *xPrimeIt = *xIt; } - if ((maxDiff - minDiff) <= relative ? (precision * minDiff) : precision) { + if ((maxDiff - minDiff) <= (relative ? (precision * minDiff) : precision)) { break; } }