refactor predecessor/successor into Node class

darcs-hash:20071105024651-5007d-89314712d7f8aa36119c8be7d0cc1e6b57cedc8a.gz

diff --git a/src/edu/berkeley/sbp/Node.java b/src/edu/berkeley/sbp/Node.java
index 532a4a8..09718af 100644 (file)
--- a/src/edu/berkeley/sbp/Node.java
+++ b/src/edu/berkeley/sbp/Node.java
@@ -14,6 +14,11 @@ class Node<OtherNode extends Node>
     implements IntegerMappable,
                GraphViz.ToGraphViz {
 
     implements IntegerMappable,
                GraphViz.ToGraphViz {
 

+    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>();
+

     // GraphViz //////////////////////////////////////////////////////////////////////////////
 
     public GraphViz.StateNode toGraphViz(GraphViz gv) {
     // GraphViz //////////////////////////////////////////////////////////////////////////////
 
     public GraphViz.StateNode toGraphViz(GraphViz gv) {

diff --git a/src/edu/berkeley/sbp/ResultNode.java b/src/edu/berkeley/sbp/ResultNode.java
index bce43c5..9b14882 100644 (file)
--- a/src/edu/berkeley/sbp/ResultNode.java
+++ b/src/edu/berkeley/sbp/ResultNode.java
@@ -10,10 +10,6 @@ final class ResultNode
     extends Node<StateNode> {
 
     private Forest.Many f = new Forest.Many();
     extends Node<StateNode> {
 
     private Forest.Many f = new Forest.Many();

-    //private HashSet<StateNode> predecessors = new HashSet<StateNode>();
-    //private HashSet<StateNode> successors = new HashSet<StateNode>();
-    private FastSet<StateNode> predecessors = new FastSet<StateNode>();
-    private FastSet<StateNode> successors = new FastSet<StateNode>();

     private boolean destroyed = false;
     private boolean primordeal;
     private int usedByNonDoomedNode = 0;
     private boolean destroyed = false;
     private boolean primordeal;
     private int usedByNonDoomedNode = 0;

diff --git a/src/edu/berkeley/sbp/StateNode.java b/src/edu/berkeley/sbp/StateNode.java
index 6401a1e..4b7834e 100644 (file)
--- a/src/edu/berkeley/sbp/StateNode.java
+++ b/src/edu/berkeley/sbp/StateNode.java
@@ -61,10 +61,6 @@ final class StateNode
     private final GSS.Phase predPhase;
     private final Parser.Table.State state;
     private  boolean fromEmptyReduction;
     private final GSS.Phase predPhase;
     private final Parser.Table.State state;
     private  boolean fromEmptyReduction;

-    private       FastSet<ResultNode> predecessors = new FastSet<ResultNode>();
-    private       FastSet<ResultNode> successors = new FastSet<ResultNode>();
-    //private       HashSet<ResultNode> predecessors = new HashSet<ResultNode>();
-    //private       HashSet<ResultNode> successors = new HashSet<ResultNode>();

 
     public final void invoke(Pos r, ResultNode only, Object o) {
         boolean emptyProductions = only==null;
 
     public final void invoke(Pos r, ResultNode only, Object o) {
         boolean emptyProductions = only==null;