Merge branch 'simulator' into v2.1

Author: nmacedo

org.alloytools.alloy.application/src/main/java/edu/mit/csail/sdg/alloy4viz/VizGUI.java

@@ -1670,7 +1670,7 @@ private Runner doNext() {
         } else {
             try {
                 enumerator.compute(new String[] { // [HASLab]
-                                                 xmlFileName, -2 + ""
+                                                 xmlFileName, -3 + ""
                 });
             } catch (Throwable ex) {
                 OurDialog.alert(ex.getMessage());

org.alloytools.alloy.application/src/main/java/edu/mit/csail/sdg/alloy4whole/SimpleReporter.java

@@ -629,9 +629,9 @@ public void run(WorkerCallback out) throws Exception {
             int tries = 0;
             while (true) {
                 try {
-                    if (this.index >= -1) {
+                    if (this.index >= -2) {
                         latestKodkods.clear();
-                        sol = sol.fork(this.index); // [HASLab] simulator
+                        sol = sol.fork(this.index); // [HASLab] simulator;  TODO: is this distinction needed?
                     } else
                         sol = sol.next();
                 } catch (ErrorAPI e) { // [HASLab]

org.alloytools.alloy.core/src/main/java/edu/mit/csail/sdg/translator/A4Solution.java

@@ -1803,7 +1803,7 @@ public A4Solution next() throws Err {
         if (eval == null)
             return this;
         if (nextCache == null)
-            nextCache = new A4Solution(this, -2);
+            nextCache = new A4Solution(this, -3);
         return nextCache;
     }