X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=src%2Fmain%2Fgov%2Fnasa%2Fjpf%2Fvm%2Fchoice%2FNumberChoiceFromList.java;fp=src%2Fmain%2Fgov%2Fnasa%2Fjpf%2Fvm%2Fchoice%2FNumberChoiceFromList.java;h=ee3d36e00aca05fcac5ce2e9716f575d104e5f70;hb=15a430755720be88420508141246ea4909cb4ade;hp=4a7b4425d57cee80ad131ed7f63f6507401a9d17;hpb=42c68a0ac3563a679987c53ce282d6807cd3d9d6;p=jpf-core.git

diff --git a/src/main/gov/nasa/jpf/vm/choice/NumberChoiceFromList.java b/src/main/gov/nasa/jpf/vm/choice/NumberChoiceFromList.java
index 4a7b442..ee3d36e 100644
--- 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() {
-    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;
+
+    /* 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() {
+    // 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++;
+    else count = 0;
+
+    /* TODO: ORIGINAL CODE
+    if (count < values.length-1) count++;*/
   }
 
   /**