From 4a29528714c8dcd259f4d367c9bcce0b19c129e1 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Mon, 30 Dec 2013 00:00:06 +0000 Subject: [PATCH] Bug fix: missing state rewards in mvMultRewMinMaxSingleChoices methods (showed up on mdps/reach/mdp_simple.nm regression test). git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7773 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/explicit/MDPSimple.java | 1 + prism/src/explicit/MDPSparse.java | 1 + 2 files changed, 2 insertions(+) diff --git a/prism/src/explicit/MDPSimple.java b/prism/src/explicit/MDPSimple.java index 68c74cf2..5c9a75bd 100644 --- a/prism/src/explicit/MDPSimple.java +++ b/prism/src/explicit/MDPSimple.java @@ -991,6 +991,7 @@ public class MDPSimple extends MDPExplicit implements NondetModelSimple prob = (Double) e.getValue(); d += prob * vect[k]; } + d += mdpRewards.getStateReward(s); // Store strategy info if value matches //if (PrismUtils.doublesAreClose(val, d, termCritParam, termCrit == TermCrit.ABSOLUTE)) { if (PrismUtils.doublesAreClose(val, d, 1e-12, false)) { diff --git a/prism/src/explicit/MDPSparse.java b/prism/src/explicit/MDPSparse.java index 8ae7b2c1..7ee8e576 100644 --- a/prism/src/explicit/MDPSparse.java +++ b/prism/src/explicit/MDPSparse.java @@ -1072,6 +1072,7 @@ public class MDPSparse extends MDPExplicit for (k = l2; k < h2; k++) { d += nonZeros[k] * vect[cols[k]]; } + d += mdpRewards.getStateReward(s); // Store strategy info if value matches if (PrismUtils.doublesAreClose(val, d, 1e-12, false)) { res.add(j - l1);