Browse Source

Bugfix: digital clocks from GUI throws errors when it should not.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2383 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Dave Parker 15 years ago
parent
commit
95f46fcf1a
  1. 4
      prism/src/prism/PrismCL.java
  2. 2
      prism/src/userinterface/properties/GUIExperiment.java
  3. 2
      prism/src/userinterface/properties/computation/ModelCheckThread.java

4
prism/src/prism/PrismCL.java

@ -645,8 +645,7 @@ public class PrismCL
// check for deadlocks
states = model.getDeadlockStates();
if (states != null) {
if (states.size() > 0) {
if (states != null && states.size() > 0) {
// for pta models (via digital clocks)
if (digital) {
// by construction, these can only occur from timelocks
@ -674,7 +673,6 @@ public class PrismCL
exit();
}
}
}
// print more model info
mainLog.println();

2
prism/src/userinterface/properties/GUIExperiment.java

@ -411,7 +411,7 @@ public class GUIExperiment
clear = false;
// by construction, deadlocks can only occur from timelocks
StateList states = model.getDeadlockStates();
if (states != null) {
if (states != null && states.size() > 0) {
throw new PrismException("Timelock in PTA, e.g. in state (" + states.getFirstAsValues() + ")");
}
// print some model info

2
prism/src/userinterface/properties/computation/ModelCheckThread.java

@ -147,7 +147,7 @@ public class ModelCheckThread extends GUIComputationThread
clear = false;
// by construction, deadlocks can only occur from timelocks
StateList states = model.getDeadlockStates();
if (states != null) {
if (states != null && states.size() > 0) {
throw new PrismException("Timelock in PTA, e.g. in state (" + states.getFirstAsValues() + ")");
}
// print some model info

Loading…
Cancel
Save