X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FNode.java;h=1168c78419ff63f58a555117096ae66a1d419c3c;hp=6fe6a74c86b2b493e0a73530e7fc9ac2ab741652;hb=9680415a3e36240dcac947b3d4d1ad6b312c4fce;hpb=731f00e92c8a8e205678900bc038a8c24cf9b2ae

diff --git a/src/edu/berkeley/sbp/Node.java b/src/edu/berkeley/sbp/Node.java
index 6fe6a74..1168c78 100644
--- a/src/edu/berkeley/sbp/Node.java
+++ b/src/edu/berkeley/sbp/Node.java
@@ -10,141 +10,51 @@ import java.io.*;
 import java.util.*;
 import java.lang.reflect.*;
 
-/** a node in the GSS */
-final class Node
-    implements Invokable<Pos, Result>,
-               IntegerMappable,
+class Node<OtherNode extends Node>
+    implements IntegerMappable,
                GraphViz.ToGraphViz,
-               Iterable<Result> {
+               Iterable<OtherNode> {
 
-    /** which GSS.Phase this Node belongs to */
-    public GSS.Phase phase() { return phase; }
-    public Iterator<Result> iterator() { return results.iterator(); }
-    public Parser.Table.State state() { return state; }
+    protected       FastSet<OtherNode> predecessors = new FastSet<OtherNode>();
+    protected       FastSet<OtherNode> successors = new FastSet<OtherNode>();
+    //private       HashSet<OtherNode> predecessors = new HashSet<OtherNode>();
+    //private       HashSet<OtherNode> successors = new HashSet<OtherNode>();
 
-    public int toInt() { return idx; }
-
-    boolean destroyed = false;
-
-    public void check() {
-        if (destroyed) return;
-        boolean dead = true;
-        // - all nodes must have a predecessor
-        // - non-doomed nodes must either:
-        //      - be on the frontier or
-        //      - have a non-doomed node closer to the frontier than themself
-        if (phase.isFrontier()) dead = false;
-        else for(Result r : successors)
-                 if (state.doomed) { if (r.usedByAnyNode()) { dead = false; break; } }
-                 else              { if (r.usedByNonDoomedNode()) { dead = false; break; } }
-        dead |= results.size()==0;
-        if (!dead) return;
-        destroyed = true;
-        if (phase() != null && phase().hash != null)
-            phase().hash.remove(state, predPhase);
-        while(successors.size()>0)
-            for(Result r : successors) {
-                successors.remove(r);
-                r.destroy();
-                break;
-            }
-        while(results.size()>0)
-            for(Result r : results) {
-                results.remove(r);
-                r.removeSucc(this);
-                break;
-            }
-        results = null;
-        successors = null;
-    }
-
-    //////////////////////////////////////////////////////////////////////
-
-    private static int node_idx = 0;
-    private final int idx = node_idx++;
-
-    private final GSS.Phase phase;
-    private final Parser.Table.State state;
-    private final boolean fromEmptyReduction;
-    //private       FastSet<Result> results = new FastSet<Result>();
-    private       HashSet<Result> results = new HashSet<Result>();
-    private       HashSet<Result> successors = new HashSet<Result>();
-
-    public final void invoke(Pos r, Result only) {
-        boolean emptyProductions = only==null;
-        if (emptyProductions != (r.numPops()==0)) return;
-        if (r.numPops()!=0)  reduce(r, r.numPops()-1, phase(), only);
-        else {
-            Input.Region region = phase().getLocation().createRegion(phase().getLocation());
-            Result.newResult(r.rewrite(region), this, r, phase());
-        }
-    }
-
-    private void reduce(Pos r, int pos, GSS.Phase target, Result only) {
-        Forest[] holder = r.holder;
-        Forest old = holder[pos];
-        if (results==null) return;   // FIXME: this should not happen
-        for(Result res : results)
-            if (only == null || res == only) {
-                Node pred = res.pred();
-                holder[pos] = res.getForest();
-                if (pos>0)  pred.reduce(r, pos-1, target, null);
-                else {
-                    Input.Region region = pred.phase().getLocation().createRegion(target.getLocation());
-                    new Reduction(pred, r, r.rewrite(region), target);
-                }
-            }
-        holder[pos] = old;
-    }
+    public Iterator<OtherNode> iterator() { return predecessors.iterator(); }
 
-    Node(GSS.Phase phase, Result pred, State state, boolean fromEmptyReduction) {
-        this.phase = phase;
-        this.state = state;
-        this.fromEmptyReduction = fromEmptyReduction;
-        if (phase.hash.get(state, pred.phase()) != null) throw new Error("severe problem!");
-        phase.hash.put(state, pred.phase(), this);
-        addResult(pred);
-        state.invokeEpsilonReductions(phase().token, this);
-    }
-
-    // Add/Remove Successors/Results //////////////////////////////////////////////////////////////////////////////
-
-    public void removeSucc(Result succ)   {
-        if (successors==null) return;
-        successors.remove(succ);
-        check();
-    }
-    public void removeResult(Result result) {
-        if (results==null) return;
-        results.remove(result);
-        check();
-    }
-    public void addSucc(Result succ)      {
-        if (successors==null) return;   // FIXME: this should not happen
-        successors.add(succ);
-    }
-    public void addResult(Result r) {
-        if (results.contains(r)) return;
-        results.add(r);
-        r.addSucc(this);
-        if (!fromEmptyReduction) state.invokeReductions(phase().getToken(), this, r);
+    public boolean noSuccessors() { return successors.size()==0; }
+    public boolean predecessorsContains(OtherNode n) {
+        return predecessors.contains(n);
     }
 
     // GraphViz //////////////////////////////////////////////////////////////////////////////
 
-    public GraphViz.Node toGraphViz(GraphViz gv) {
-        if (results.size()==0) return null;
+    public GraphViz.StateNode toGraphViz(GraphViz gv) {
         if (gv.hasNode(this)) return gv.createNode(this);
-        GraphViz.Node n = gv.createNode(this);
+        GraphViz.StateNode n = gv.createNode(this);
+        /*
+        n.label = ""+f;
+        n.shape = "rectangle";
+        //if (pred()!=null) n.edge(pred, "");
+        n.color = "blue";
+        if (phase() != null)
+            ((GraphViz.Group)phase().toGraphViz(gv)).add(n);
         n.label = "state["+state.toInt()+"]";
         n.shape = "rectangle";
         boolean haspreds = false;
-        for(Result r : results) n.edge(r, "");
+        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; }
 
-}
+    // IntegerMappable ////////////////////////////////////////////////////////////
+
+    private static int node_idx = 0;
+    private final int idx = node_idx++;
+    public int toInt() { return idx; }
+
+}
\ No newline at end of file