more unform naming for add/remove

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

diff --git a/src/edu/berkeley/sbp/ResultNode.java b/src/edu/berkeley/sbp/ResultNode.java
index d61b06b..e22bd45 100644 (file)
--- a/src/edu/berkeley/sbp/ResultNode.java
+++ b/src/edu/berkeley/sbp/ResultNode.java
@@ -6,22 +6,16 @@ import edu.berkeley.sbp.Sequence.Pos;
 import edu.berkeley.sbp.Sequence.Pos;
 import java.util.*;
 
-final class ResultNode extends Node {
+final class ResultNode
+    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 Pos reduction;
     private GSS.Phase predPhase;
 
-    public boolean predecessorsContains(StateNode n) {
-        return predecessors.contains(n);
-    }
     public Pos reduction() { return reduction; }
     public void merge(Forest newf) {
         this.f.merge(newf);
@@ -33,11 +27,8 @@ final class ResultNode extends Node {
         */
     }
 
-    public boolean noSuccessors() { return successors.size()==0; }
-
     public GSS.Phase phase() { return predPhase; }
     public Forest getForest() { return f; }
-    public Iterable<StateNode> getPreds() { return predecessors; }
     public void addSucc(StateNode succ) {
         if (successors.contains(succ)) return;
         successors.add(succ);
@@ -74,7 +65,7 @@ final class ResultNode extends Node {
         while(successors.size() > 0)
             for(StateNode succ : successors) {
                 removeSucc(succ);
-                succ.removeResult(this);
+                succ.removePred(this);
                 break;
             }
         successors = null;