imported patch min-max-ExpressionProbRewardMinMaxConstructor.patch

prism/src/parser/ast/ExpressionProb.java

@@ -26,6 +26,7 @@
 
 package parser.ast;
 
+import explicit.MinMax;
 import param.BigRational;
 import parser.EvaluateContext;
 import parser.Values;
@@ -48,6 +49,14 @@ public class ExpressionProb extends ExpressionQuant
 		setBound(p);
 	}
 
+	public ExpressionProb(Expression expression, MinMax minMax, String relOpString, Expression p) throws PrismLangException
+	{
+		setExpression(expression);
+		setMinMax(minMax);
+		setRelOp(relOpString);
+		setBound(p);
+	}
+
 	// Set methods
 
 	/**

prism/src/parser/ast/ExpressionReward.java

@@ -28,6 +28,7 @@ package parser.ast;
 
 import java.util.List;
 
+import explicit.MinMax;
 import param.BigRational;
 import parser.EvaluateContext;
 import parser.Values;
@@ -55,6 +56,14 @@ public class ExpressionReward extends ExpressionQuant
 		setBound(r);
 	}
 
+	public ExpressionReward(Expression expression, MinMax minMax, String relOpString, Expression r) throws PrismLangException
+	{
+		setExpression(expression);
+		setMinMax(minMax);
+		setRelOp(relOpString);
+		setBound(r);
+	}
+
 	// Set methods
 	
 	public void setRewardStructIndex(Object o)
@@ -211,7 +220,7 @@ public class ExpressionReward extends ExpressionQuant
 	 */
 	public boolean isMin()
 	{
-		return getRelOp().isMin() || getRelOp().isLowerBound();
+		return (getMinMax() != null && getMinMax().isMin()) || getRelOp().isLowerBound();
 	}
 	
 	// Methods required for Expression: