Browse Source

imported patch time-bounded-not-supported-message.patch

accumulation-v4.7
Joachim Klein 7 years ago
committed by Joachim Klein
parent
commit
5022be36c3
  1. 2
      prism/src/prism/LTLModelChecker.java
  2. 8
      prism/src/prism/NondetModelChecker.java
  3. 8
      prism/src/prism/ProbModelChecker.java

2
prism/src/prism/LTLModelChecker.java

@ -324,7 +324,7 @@ public class LTLModelChecker extends PrismComponent
if (Expression.containsTemporalTimeBounds(expr)) { if (Expression.containsTemporalTimeBounds(expr)) {
if (model.getModelType().continuousTime()) { if (model.getModelType().continuousTime()) {
throw new PrismException("DA construction for time-bounded operators not supported for " + model.getModelType()+".");
throw new PrismNotSupportedException("DA construction for time-bounded operators not supported for " + model.getModelType()+".");
} }
if (!expr.isSimplePathFormula()) { if (!expr.isSimplePathFormula()) {

8
prism/src/prism/NondetModelChecker.java

@ -1556,7 +1556,7 @@ public class NondetModelChecker extends NonProbModelChecker
if (Expression.containsTemporalTimeBounds(expr)) { if (Expression.containsTemporalTimeBounds(expr)) {
if (model.getModelType().continuousTime()) { if (model.getModelType().continuousTime()) {
JDD.Deref(statesOfInterest); JDD.Deref(statesOfInterest);
throw new PrismException("DA construction for time-bounded operators not supported for " + model.getModelType()+".");
throw new PrismNotSupportedException("DA construction for time-bounded operators not supported for " + model.getModelType()+".");
} }
if (expr.isSimplePathFormula()) { if (expr.isSimplePathFormula()) {
@ -1570,18 +1570,18 @@ public class NondetModelChecker extends NonProbModelChecker
expr = Expression.convertSimplePathFormulaToCanonicalForm(expr); expr = Expression.convertSimplePathFormulaToCanonicalForm(expr);
} else { } else {
JDD.Deref(statesOfInterest); JDD.Deref(statesOfInterest);
throw new PrismException("Time-bounded operators not supported in LTL: " + expr);
throw new PrismNotSupportedException("Time-bounded operators not supported in LTL: " + expr);
} }
} }
// Can't do "dfa" properties yet // Can't do "dfa" properties yet
if (expr instanceof ExpressionFunc && ((ExpressionFunc) expr).getName().equals("dfa")) { if (expr instanceof ExpressionFunc && ((ExpressionFunc) expr).getName().equals("dfa")) {
JDD.Deref(statesOfInterest); JDD.Deref(statesOfInterest);
throw new PrismException("Model checking for \"dfa\" specifications not supported yet");
throw new PrismNotSupportedException("Model checking for \"dfa\" specifications not supported yet");
} }
if (Expression.containsTemporalRewardBounds(expr)) { if (Expression.containsTemporalRewardBounds(expr)) {
throw new PrismException("Can not handle reward bounds via deterministic automata.");
throw new PrismNotSupportedException("Can not handle reward bounds via deterministic automata.");
} }
if (Expression.isHOA(expr)) { if (Expression.isHOA(expr)) {

8
prism/src/prism/ProbModelChecker.java

@ -1015,25 +1015,25 @@ public class ProbModelChecker extends NonProbModelChecker
if (Expression.containsTemporalRewardBounds(expr)) { if (Expression.containsTemporalRewardBounds(expr)) {
JDD.Deref(statesOfInterest); JDD.Deref(statesOfInterest);
throw new PrismException("Can not handle reward bounds via deterministic automata.");
throw new PrismNotSupportedException("Can not handle reward bounds via deterministic automata.");
} }
if (Expression.containsTemporalTimeBounds(expr)) { if (Expression.containsTemporalTimeBounds(expr)) {
if (model.getModelType().continuousTime()) { if (model.getModelType().continuousTime()) {
JDD.Deref(statesOfInterest); JDD.Deref(statesOfInterest);
throw new PrismException("DA construction for time-bounded operators not supported for " + model.getModelType()+".");
throw new PrismNotSupportedException("DA construction for time-bounded operators not supported for " + model.getModelType()+".");
} }
if (!expr.isSimplePathFormula()) { if (!expr.isSimplePathFormula()) {
JDD.Deref(statesOfInterest); JDD.Deref(statesOfInterest);
throw new PrismException("Time-bounded operators not supported in LTL: " + expr);
throw new PrismNotSupportedException("Time-bounded operators not supported in LTL: " + expr);
} }
} }
// Can't do "dfa" properties yet // Can't do "dfa" properties yet
if (expr instanceof ExpressionFunc && ((ExpressionFunc) expr).getName().equals("dfa")) { if (expr instanceof ExpressionFunc && ((ExpressionFunc) expr).getName().equals("dfa")) {
JDD.Deref(statesOfInterest); JDD.Deref(statesOfInterest);
throw new PrismException("Model checking for \"dfa\" specifications not supported yet");
throw new PrismNotSupportedException("Model checking for \"dfa\" specifications not supported yet");
} }
if (Expression.isHOA(expr)) { if (Expression.isHOA(expr)) {

Loading…
Cancel
Save