From 5d9573628d770072c871d41df90c49f9e8e514d1 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Mon, 17 Jan 2011 23:38:20 +0000 Subject: [PATCH] Better error message for simulator on filters. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2392 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/simulator/SimulatorEngine.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/prism/src/simulator/SimulatorEngine.java b/prism/src/simulator/SimulatorEngine.java index b23e1aa8..14100dcd 100644 --- a/prism/src/simulator/SimulatorEngine.java +++ b/prism/src/simulator/SimulatorEngine.java @@ -1085,8 +1085,12 @@ public class SimulatorEngine */ public void checkPropertyForSimulation(Expression prop) throws PrismException { - // Simulator can only be applied to P or R properties + // Simulator can only be applied to P or R properties (without filters) if (!(prop instanceof ExpressionProb || prop instanceof ExpressionReward)) { + if (prop instanceof ExpressionFilter) { + if (((ExpressionFilter) prop).getOperand() instanceof ExpressionProb || ((ExpressionFilter) prop).getOperand() instanceof ExpressionReward) + throw new PrismException("Simulator cannot handle P or R properties with filters"); + } throw new PrismException("Simulator can only handle P or R properties"); } // Check that there are no nested probabilistic operators