more unform naming for add/remove

darcs-hash:20071105025021-5007d-37eb1eb9cc8374584c6ef294918c9b34e207411f.gz

diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index 2e57348..2d2e550 100644 (file)
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -192,7 +192,7 @@ class GSS {
         private boolean newNode(Forest f, Pos reduction, StateNode pred, State state, boolean fromEmptyReduction) {
             StateNode p = pred==null ? null : hash.get(state, pred.phase());
             if (p != null) {
         private boolean newNode(Forest f, Pos reduction, StateNode pred, State state, boolean fromEmptyReduction) {
             StateNode p = pred==null ? null : hash.get(state, pred.phase());
             if (p != null) {

-                p.addResult(f, reduction, pred);
+                p.addPred(f, reduction, pred);

                 return !state.doomed();
             }
             do {
                 return !state.doomed();
             }
             do {

diff --git a/src/edu/berkeley/sbp/ResultNode.java b/src/edu/berkeley/sbp/ResultNode.java
index 6a6629c..e22bd45 100644 (file)
--- a/src/edu/berkeley/sbp/ResultNode.java
+++ b/src/edu/berkeley/sbp/ResultNode.java
@@ -65,7 +65,7 @@ final class ResultNode
         while(successors.size() > 0)
             for(StateNode succ : successors) {
                 removeSucc(succ);
         while(successors.size() > 0)
             for(StateNode succ : successors) {
                 removeSucc(succ);

-                succ.removeResult(this);
+                succ.removePred(this);

                 break;
             }
         successors = null;
                 break;
             }
         successors = null;

diff --git a/src/edu/berkeley/sbp/StateNode.java b/src/edu/berkeley/sbp/StateNode.java
index 2a438e5..bb461cb 100644 (file)
--- a/src/edu/berkeley/sbp/StateNode.java
+++ b/src/edu/berkeley/sbp/StateNode.java
@@ -115,14 +115,14 @@ final class StateNode
         successors.remove(succ);
         check();
     }
         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);
     }
         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);
         for(ResultNode r : predecessors)
             if (r.predecessorsContains(pred)) {
                 r.merge(f);