Browse Source

Bug fix in output of path generated from simulation: last 2 times were duplicated.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@5277 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Dave Parker 14 years ago
parent
commit
614554325e
  1. 4
      prism/src/simulator/PathFull.java
  2. 9
      prism/src/simulator/Updater.java

4
prism/src/simulator/PathFull.java

@ -473,7 +473,7 @@ public class PathFull extends Path implements PathFullInfo
changed = true;
}
if (!changed) {
d = (i < n - 1) ? getTime(i) : 0.0;
d = (i < n) ? getTime(i) : 0.0;
t += d;
continue;
}
@ -485,7 +485,7 @@ public class PathFull extends Path implements PathFullInfo
log.print(i);
// print time (if continuous time)
if (contTime) {
d = (i < n - 1) ? getTime(i) : 0.0;
d = (i < n) ? getTime(i) : 0.0;
log.print(colSep + (timeCumul ? t : d));
t += d;
}

9
prism/src/simulator/Updater.java

@ -323,7 +323,14 @@ public class Updater
if (modelType.choicesSumToOne() && Math.abs(sum - 1) > prism.getSumRoundOff()) {
throw new PrismLangException("Probabilities sum to " + sum + " in state " + state.toString(modulesFile), ups);
}
// Check if empty (e.g. due to all 0 probs/rates)
// Currently, PRISM treats this as an error
if (ch.size() == 0) {
String msg = modelType.probabilityOrRate();
msg += (ups.getNumUpdates() > 1) ? " values sum to " : " is ";
msg += "zero for update in state " + state.toString(modulesFile);
//throw new PrismLangException(msg, ups);
}
return ch;
}

Loading…
Cancel
Save