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

explicit.MDP: use OfInt based iterator in default implementations of mv... methods 

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12101 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Joachim Klein 9 years ago
parent
3c691c980a
commit
a216904acb
1 changed files with 8 additions and 4 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. 12
      prism/src/explicit/MDP.java

12
prism/src/explicit/MDP.java
View File

@ -274,7 +274,8 @@ public interface MDP extends NondetModel
*/ */
public default void mvMultMinMax(double vect[], boolean min, double result[], BitSet subset, boolean complement, int strat[]) public default void mvMultMinMax(double vect[], boolean min, double result[], BitSet subset, boolean complement, int strat[])
{ {
for (int s : new IterableStateSet(subset, getNumStates(), complement)) {
for (OfInt it = new IterableStateSet(subset, getNumStates(), complement).iterator(); it.hasNext();) {
final int s = it.nextInt();
result[s] = mvMultMinMaxSingle(s, vect, min, strat); result[s] = mvMultMinMaxSingle(s, vect, min, strat);
} }
} }
@ -325,7 +326,8 @@ public interface MDP extends NondetModel
public default double mvMultGSMinMax(double vect[], boolean min, BitSet subset, boolean complement, boolean absolute, int strat[]) public default double mvMultGSMinMax(double vect[], boolean min, BitSet subset, boolean complement, boolean absolute, int strat[])
{ {
double d, diff, maxDiff = 0.0; double d, diff, maxDiff = 0.0;
for (int s : new IterableStateSet(subset, getNumStates(), complement)) {
for (OfInt it = new IterableStateSet(subset, getNumStates(), complement).iterator(); it.hasNext();) {
final int s = it.nextInt();
d = mvMultJacMinMaxSingle(s, vect, min, strat); d = mvMultJacMinMaxSingle(s, vect, min, strat);
diff = absolute ? (Math.abs(d - vect[s])) : (Math.abs(d - vect[s]) / d); diff = absolute ? (Math.abs(d - vect[s])) : (Math.abs(d - vect[s]) / d);
maxDiff = diff > maxDiff ? diff : maxDiff; maxDiff = diff > maxDiff ? diff : maxDiff;
@ -377,7 +379,8 @@ public interface MDP extends NondetModel
*/ */
public default void mvMultRewMinMax(double vect[], MDPRewards mdpRewards, boolean min, double result[], BitSet subset, boolean complement, int strat[]) public default void mvMultRewMinMax(double vect[], MDPRewards mdpRewards, boolean min, double result[], BitSet subset, boolean complement, int strat[])
{ {
for (int s : new IterableStateSet(subset, getNumStates(), complement)) {
for (OfInt it = new IterableStateSet(subset, getNumStates(), complement).iterator(); it.hasNext();) {
final int s = it.nextInt();
result[s] = mvMultRewMinMaxSingle(s, vect, mdpRewards, min, strat); result[s] = mvMultRewMinMaxSingle(s, vect, mdpRewards, min, strat);
} }
} }
@ -423,7 +426,8 @@ public interface MDP extends NondetModel
public default double mvMultRewGSMinMax(double vect[], MDPRewards mdpRewards, boolean min, BitSet subset, boolean complement, boolean absolute, int strat[]) public default double mvMultRewGSMinMax(double vect[], MDPRewards mdpRewards, boolean min, BitSet subset, boolean complement, boolean absolute, int strat[])
{ {
double d, diff, maxDiff = 0.0; double d, diff, maxDiff = 0.0;
for (int s : new IterableStateSet(subset, getNumStates(), complement)) {
for (OfInt it = new IterableStateSet(subset, getNumStates(), complement).iterator(); it.hasNext();) {
final int s = it.nextInt();
d = mvMultRewJacMinMaxSingle(s, vect, mdpRewards, min, strat); d = mvMultRewJacMinMaxSingle(s, vect, mdpRewards, min, strat);
diff = absolute ? (Math.abs(d - vect[s])) : (Math.abs(d - vect[s]) / d); diff = absolute ? (Math.abs(d - vect[s])) : (Math.abs(d - vect[s]) / d);
maxDiff = diff > maxDiff ? diff : maxDiff; maxDiff = diff > maxDiff ? diff : maxDiff;

Write Preview
Loading…
Cancel
Save