Browse Source

Bug fix: crash on invalid integer reward struct indices.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@5420 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Dave Parker 14 years ago
parent
commit
0245cf77b4
  1. 5
      prism/src/simulator/sampler/Sampler.java

5
prism/src/simulator/sampler/Sampler.java

@ -225,8 +225,9 @@ public abstract class Sampler
if (rs == null) {
rsi = 0;
} else if (rs instanceof Expression) {
rsi = ((Expression) rs).evaluateInt() - 1;
rs = new Integer(rsi + 1); // for better error reporting below
rsi = ((Expression) rs).evaluateInt();
rs = new Integer(rsi); // for better error reporting below
rsi = (rsi < 1 || rsi > mf.getNumRewardStructs()) ? -1 : rsi - 1;
} else if (rs instanceof String) {
rsi = mf.getRewardStructIndex((String) rs);
}

Loading…
Cancel
Save