Allow wider ranger of co-safe LTL formulae inside an R operator (more precisely, those that can also be rewritten into co-safe form).

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10613 bbc10eb1-c90d-0410-af57-cb519fbb1720

prism/src/prism/NondetModelChecker.java

@@ -1290,7 +1290,7 @@ public class NondetModelChecker extends NonProbModelChecker
 		if (Expression.isReach(expr)) {
 			return checkRewardReach((ExpressionTemporal) expr, stateRewards, transRewards, min);
 		}
-		else if (Expression.isCoSafeLTLSyntactic(expr)) {
+		else if (Expression.isCoSafeLTLSyntactic(expr, true)) {
 			return checkRewardCoSafeLTL(expr, stateRewards, transRewards, min);
 		}
 		throw new PrismException("R operator contains a path formula that is not syntactically co-safe: " + expr);

prism/src/prism/ProbModelChecker.java

@@ -820,7 +820,7 @@ public class ProbModelChecker extends NonProbModelChecker
 		if (Expression.isReach(expr)) {
 			return checkRewardReach((ExpressionTemporal) expr, stateRewards, transRewards);
 		}
-		else if (Expression.isCoSafeLTLSyntactic(expr)) {
+		else if (Expression.isCoSafeLTLSyntactic(expr, true)) {
 			return checkRewardCoSafeLTL(expr, stateRewards, transRewards);
 		}
 		throw new PrismException("R operator contains a path formula that is not syntactically co-safe: " + expr);