X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=ac62e18eecd2bd31d8bd8a25a921233b88d97abf;hp=5255a21a65da9649d02dc0af5c5b998d82b49a66;hb=390b254a3d680502e11c8f1d9f17d5606f62c82c;hpb=0c94acf3155fe6b26678c1dd162b71eaf102597d

diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index 5255a21..ac62e18 100644
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -196,6 +196,8 @@ class GSS {
             return true;
         }
 
+        LinkedList<Node> reductionQueue = new LinkedList<Node>();
+
         /** perform all reduction operations */
         public void reduce() throws ParseFailed {
             try {
@@ -210,9 +212,11 @@ class GSS {
                     // INVARIANT: we never "see" a node until its parent-set is complete, modulo merges
                 }
                 for(int i=0; i<num; i++) {
-                    Node n = reducing_list[i];
+                    reductionQueue.add(reducing_list[i]);
                     reducing_list[i] = null;
-                    n.performReductions();
+                }
+                while(!reductionQueue.isEmpty()) {
+                    reductionQueue.remove().performReductions();
                 }
                 if (reset) {
                     reset = false;
@@ -301,8 +305,6 @@ class GSS {
         /** a node in the GSS */
         final class Node implements Invokable<Position, Node, Node>, IntegerMappable, GraphViz.ToGraphViz {
             public FastSet<Node> set = new FastSet<Node>();
-
-           
             private boolean allqueued = false;
 
             /** what state this node is in */
@@ -337,7 +339,7 @@ class GSS {
             }
 
             public void performReductions(Node n2) {
-                if (!allqueued) performReductions();
+                if (!allqueued) reductionQueue.add(this);//performReductions();
                 else            state.invokeReductions(token, this, this, n2);
             }