refactor predecessor/successor into Node class

[sbp.git] / src / edu / berkeley / sbp / StateNode.java

diff --git a/src/edu/berkeley/sbp/StateNode.java b/src/edu/berkeley/sbp/StateNode.java
index 35f727d..4b7834e 100644 (file)
--- a/src/edu/berkeley/sbp/StateNode.java
+++ b/src/edu/berkeley/sbp/StateNode.java
@@ -12,19 +12,15 @@ import java.lang.reflect.*;
 
 /** a node in the GSS */
 final class StateNode
-    extends Node
+    extends Node<ResultNode>
     implements Invokable<Pos, ResultNode, Object>,
-               IntegerMappable,
-               GraphViz.ToGraphViz,
                Iterable<ResultNode> {
 
     /** which GSS.Phase this StateNode belongs to */
     public GSS.Phase phase() { return phase; }
-    public Iterator<ResultNode> iterator() { return results.iterator(); }
+    public Iterator<ResultNode> iterator() { return predecessors.iterator(); }
     public Parser.Table.State state() { return state; }
 
-    public int toInt() { return idx; }
-
     boolean destroyed = false;
 
     public void check() {
@@ -38,7 +34,7 @@ final class StateNode
         else for(ResultNode r : successors)
                  if (state.doomed) { if (r.usedByAnyNode()) { dead = false; break; } }
                  else              { if (r.usedByNonDoomedNode()) { dead = false; break; } }
-        dead |= results.size()==0;
+        dead |= predecessors.size()==0;
         if (!dead) return;
         destroyed = true;
         if (phase() != null && phase().hash != null)
@@ -49,29 +45,22 @@ final class StateNode
                 r.removePred(this);
                 break;
             }
-        while(results.size()>0)
-            for(ResultNode r : results) {
-                results.remove(r);
+        while(predecessors.size()>0)
+            for(ResultNode r : predecessors) {
+                predecessors.remove(r);
                 r.removeSucc(this);
                 break;
             }
-        results = null;
+        predecessors = null;
         successors = null;
     }
 
     //////////////////////////////////////////////////////////////////////
 
-    private static int node_idx = 0;
-    private final int idx = node_idx++;
-
     private final GSS.Phase phase;
     private final GSS.Phase predPhase;
     private final Parser.Table.State state;
     private  boolean fromEmptyReduction;
-    private       FastSet<ResultNode> results = new FastSet<ResultNode>();
-    private       FastSet<ResultNode> successors = new FastSet<ResultNode>();
-    //private       HashSet<ResultNode> results = new HashSet<ResultNode>();
-    //private       HashSet<ResultNode> successors = new HashSet<ResultNode>();
 
     public final void invoke(Pos r, ResultNode only, Object o) {
         boolean emptyProductions = only==null;
@@ -84,7 +73,7 @@ final class StateNode
     }
 
     private void reduce(Pos r, int pos, GSS.Phase target, ResultNode only) {
-        for(ResultNode res : results)
+        for(ResultNode res : predecessors)
             if (only == null || res == only)
                 for(StateNode pred : res.getPreds())
                     reduce2(r, pos, target, pred, res.getForest());
@@ -113,7 +102,7 @@ final class StateNode
         this.predPhase = pred.phase();
         phase.hash.put(state, pred.phase(), this);
 
-        results.add(pred);
+        predecessors.add(pred);
         pred.addSucc(this);
         if (!fromEmptyReduction)
             state.invokeReductions(phase().getToken(), this, pred);
@@ -121,46 +110,28 @@ final class StateNode
         state.invokeEpsilonReductions(phase().token, this);
     }
 
-    // Add/Remove Successors/Results //////////////////////////////////////////////////////////////////////////////
+    // Add/Remove Successors/Predecessors //////////////////////////////////////////////////////////////////////////////
 
     public void removeSucc(ResultNode succ)   {
         successors.remove(succ);
         check();
     }
     public void removeResult(ResultNode result) {
-        results.remove(result);
+        predecessors.remove(result);
         check();
     }
     public void addSucc(ResultNode succ)      {
         successors.add(succ);
     }
     public void addResult(Forest f, Pos reduction, StateNode pred) {
-        for(ResultNode r : results)
+        for(ResultNode r : predecessors)
             if (r.predecessorsContains(pred)) {
                 r.merge(f);
                 return;
             }
         ResultNode result = new ResultNode(f, reduction, pred);
-        results.add(result);
+        predecessors.add(result);
         result.addSucc(this);
         if (!this.fromEmptyReduction) state.invokeReductions(phase().getToken(), this, result);
     }
-
-    // GraphViz //////////////////////////////////////////////////////////////////////////////
-
-    public GraphViz.StateNode toGraphViz(GraphViz gv) {
-        if (results.size()==0) return null;
-        if (gv.hasNode(this)) return gv.createNode(this);
-        GraphViz.StateNode n = gv.createNode(this);
-        n.label = "state["+state.toInt()+"]";
-        n.shape = "rectangle";
-        boolean haspreds = false;
-        for(ResultNode r : results) n.edge(r, "");
-        n.color = state.doomed ? "red" : "green";
-        ((GraphViz.Group)phase().toGraphViz(gv)).add(n);
-        return n;
-    }
-    public boolean isTransparent() { return false; }
-    public boolean isHidden() { return false; }
-
 }