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

@@ -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)) {

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);