projects
/
jpf-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
42c68a0
)
A few hacks to make the list circular: this lets the CG not signal the JPF that the...
author
rtrimana
<rtrimana@uci.edu>
Fri, 19 Jun 2020 16:42:07 +0000
(09:42 -0700)
committer
rtrimana
<rtrimana@uci.edu>
Fri, 19 Jun 2020 16:42:07 +0000
(09:42 -0700)
src/main/gov/nasa/jpf/vm/choice/NumberChoiceFromList.java
patch
|
blob
|
history
diff --git
a/src/main/gov/nasa/jpf/vm/choice/NumberChoiceFromList.java
b/src/main/gov/nasa/jpf/vm/choice/NumberChoiceFromList.java
index 4a7b4425d57cee80ad131ed7f63f6507401a9d17..ee3d36e00aca05fcac5ce2e9716f575d104e5f70 100644
(file)
--- a/
src/main/gov/nasa/jpf/vm/choice/NumberChoiceFromList.java
+++ b/
src/main/gov/nasa/jpf/vm/choice/NumberChoiceFromList.java
@@
-110,10
+110,18
@@
public abstract class NumberChoiceFromList<T extends Number> extends ChoiceGener
**/
@Override
public boolean hasMoreChoices() {
**/
@Override
public boolean hasMoreChoices() {
- if (!isDone && (count < values.length-1))
+ // TODO: Fix for Groovy's model-checking
+ // TODO: This is a setter to change the values of the ChoiceGenerator to implement POR
+ if (!isDone)
return true;
else
return false;
return true;
else
return false;
+
+ /* TODO: ORIGINAL CODE
+ if (!isDone && (count < values.length-1))
+ return true;
+ else
+ return false;*/
}
/**
}
/**
@@
-121,7
+129,15
@@
public abstract class NumberChoiceFromList<T extends Number> extends ChoiceGener
**/
@Override
public void advance() {
**/
@Override
public void advance() {
+ // TODO: Fix for Groovy's model-checking
+ // TODO: This is a setter to change the values of the ChoiceGenerator to implement POR
+
+ // TODO: We make this circular
if (count < values.length-1) count++;
if (count < values.length-1) count++;
+ else count = 0;
+
+ /* TODO: ORIGINAL CODE
+ if (count < values.length-1) count++;*/
}
/**
}
/**