Browse Source

Small fix for previous commit.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9460 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Dave Parker 11 years ago
parent
commit
82de131735
  1. 7
      prism/src/explicit/ProbModelChecker.java

7
prism/src/explicit/ProbModelChecker.java

@ -521,7 +521,6 @@ public class ProbModelChecker extends NonProbModelChecker
*/ */
protected StateValues checkExpressionProb(Model model, ExpressionProb expr, boolean forAll, Coalition coalition) throws PrismException protected StateValues checkExpressionProb(Model model, ExpressionProb expr, boolean forAll, Coalition coalition) throws PrismException
{ {
// Get info from P operator // Get info from P operator
OpRelOpBound opInfo = expr.getRelopBoundInfo(constantValues); OpRelOpBound opInfo = expr.getRelopBoundInfo(constantValues);
MinMax minMax = opInfo.getMinMax(model.getModelType()); MinMax minMax = opInfo.getMinMax(model.getModelType());
@ -541,7 +540,7 @@ public class ProbModelChecker extends NonProbModelChecker
} }
// Otherwise, compare against bound to get set of satisfying states // Otherwise, compare against bound to get set of satisfying states
else { else {
BitSet sol = probs.getBitSetFromInterval(expr.getRelOp(), opInfo.getBound());
BitSet sol = probs.getBitSetFromInterval(opInfo.getRelOp(), opInfo.getBound());
probs.clear(); probs.clear();
return StateValues.createFromBitSet(sol, model); return StateValues.createFromBitSet(sol, model);
} }
@ -761,7 +760,7 @@ public class ProbModelChecker extends NonProbModelChecker
} }
// Otherwise, compare against bound to get set of satisfying states // Otherwise, compare against bound to get set of satisfying states
else { else {
BitSet sol = rews.getBitSetFromInterval(expr.getRelOp(), opInfo.getBound());
BitSet sol = rews.getBitSetFromInterval(opInfo.getRelOp(), opInfo.getBound());
rews.clear(); rews.clear();
return StateValues.createFromBitSet(sol, model); return StateValues.createFromBitSet(sol, model);
} }
@ -948,7 +947,7 @@ public class ProbModelChecker extends NonProbModelChecker
} }
// Otherwise, compare against bound to get set of satisfying states // Otherwise, compare against bound to get set of satisfying states
else { else {
BitSet sol = probs.getBitSetFromInterval(expr.getRelOp(), opInfo.getBound());
BitSet sol = probs.getBitSetFromInterval(opInfo.getRelOp(), opInfo.getBound());
probs.clear(); probs.clear();
return StateValues.createFromBitSet(sol, model); return StateValues.createFromBitSet(sol, model);
} }

Loading…
Cancel
Save