more unform naming for add/remove

[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 4b7834e..bb461cb 100644 (file)
--- a/src/edu/berkeley/sbp/StateNode.java
+++ b/src/edu/berkeley/sbp/StateNode.java
@@ -13,8 +13,7 @@ import java.lang.reflect.*;
 /** a node in the GSS */
 final class StateNode
     extends Node<ResultNode>
-    implements Invokable<Pos, ResultNode, Object>,
-               Iterable<ResultNode> {
+    implements Invokable<Pos, ResultNode, Object> {
 
     /** which GSS.Phase this StateNode belongs to */
     public GSS.Phase phase() { return phase; }
@@ -75,7 +74,7 @@ final class StateNode
     private void reduce(Pos r, int pos, GSS.Phase target, ResultNode only) {
         for(ResultNode res : predecessors)
             if (only == null || res == only)
-                for(StateNode pred : res.getPreds())
+                for(StateNode pred : res)
                     reduce2(r, pos, target, pred, res.getForest());
     }
 
@@ -116,14 +115,14 @@ final class StateNode
         successors.remove(succ);
         check();
     }
-    public void removeResult(ResultNode result) {
+    public void removePred(ResultNode result) {
         predecessors.remove(result);
         check();
     }
     public void addSucc(ResultNode succ)      {
         successors.add(succ);
     }
-    public void addResult(Forest f, Pos reduction, StateNode pred) {
+    public void addPred(Forest f, Pos reduction, StateNode pred) {
         for(ResultNode r : predecessors)
             if (r.predecessorsContains(pred)) {
                 r.merge(f);