s14h
/
prism-accumulation
1
0
Fork 0
Code Releases Activity
Browse Source

Code tidy. 

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@5633 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Dave Parker 13 years ago
parent
da50f86281
commit
3b59b8f6cd
1 changed files with 2 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      prism/src/explicit/MDPModelChecker.java

8
prism/src/explicit/MDPModelChecker.java
View File

@ -768,7 +768,7 @@ public class MDPModelChecker extends ProbModelChecker
protected ModelCheckerResult computeReachProbsPolIter(MDP mdp, BitSet no, BitSet yes, boolean min) throws PrismException protected ModelCheckerResult computeReachProbsPolIter(MDP mdp, BitSet no, BitSet yes, boolean min) throws PrismException
{ {
ModelCheckerResult res; ModelCheckerResult res;
int i, n, iters, totalIters, diff;
int i, n, iters, totalIters;
double soln[], soln2[]; double soln[], soln2[];
boolean done; boolean done;
long timer; long timer;
@ -817,7 +817,6 @@ public class MDPModelChecker extends ProbModelChecker
// Check if optimal, improve non-optimal choices // Check if optimal, improve non-optimal choices
mdp.mvMultMinMax(soln, min, soln2, null, false, null); mdp.mvMultMinMax(soln, min, soln2, null, false, null);
done = true; done = true;
diff = 0;
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
// Don't look at no/yes states - we don't store adversary info for them, // Don't look at no/yes states - we don't store adversary info for them,
// so they might appear non-optimal // so they might appear non-optimal
@ -825,7 +824,6 @@ public class MDPModelChecker extends ProbModelChecker
continue; continue;
if (!PrismUtils.doublesAreClose(soln[i], soln2[i], termCritParam, termCrit == TermCrit.ABSOLUTE)) { if (!PrismUtils.doublesAreClose(soln[i], soln2[i], termCritParam, termCrit == TermCrit.ABSOLUTE)) {
done = false; done = false;
diff++;
List<Integer> opt = mdp.mvMultMinMaxSingleChoices(i, soln, min, soln2[i]); List<Integer> opt = mdp.mvMultMinMaxSingleChoices(i, soln, min, soln2[i]);
// If update adversary if strictly better // If update adversary if strictly better
if (!opt.contains(adv[i])) if (!opt.contains(adv[i]))
@ -857,7 +855,7 @@ public class MDPModelChecker extends ProbModelChecker
protected ModelCheckerResult computeReachProbsModPolIter(MDP mdp, BitSet no, BitSet yes, boolean min) throws PrismException protected ModelCheckerResult computeReachProbsModPolIter(MDP mdp, BitSet no, BitSet yes, boolean min) throws PrismException
{ {
ModelCheckerResult res; ModelCheckerResult res;
int i, n, iters, totalIters, diff;
int i, n, iters, totalIters;
double soln[], soln2[]; double soln[], soln2[];
boolean done; boolean done;
long timer; long timer;
@ -906,7 +904,6 @@ public class MDPModelChecker extends ProbModelChecker
// Check if optimal, improve non-optimal choices // Check if optimal, improve non-optimal choices
mdp.mvMultMinMax(soln, min, soln2, null, false, null); mdp.mvMultMinMax(soln, min, soln2, null, false, null);
done = true; done = true;
diff = 0;
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
// Don't look at no/yes states - we don't store adversary info for them, // Don't look at no/yes states - we don't store adversary info for them,
// so they might appear non-optimal // so they might appear non-optimal
@ -914,7 +911,6 @@ public class MDPModelChecker extends ProbModelChecker
continue; continue;
if (!PrismUtils.doublesAreClose(soln[i], soln2[i], termCritParam, termCrit == TermCrit.ABSOLUTE)) { if (!PrismUtils.doublesAreClose(soln[i], soln2[i], termCritParam, termCrit == TermCrit.ABSOLUTE)) {
done = false; done = false;
diff++;
List<Integer> opt = mdp.mvMultMinMaxSingleChoices(i, soln, min, soln2[i]); List<Integer> opt = mdp.mvMultMinMaxSingleChoices(i, soln, min, soln2[i]);
adv[i] = opt.get(0); adv[i] = opt.get(0);
} }

Write Preview
Loading…
Cancel
Save