some simplifications to GSS, ResultNode, and StateNode

[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 579a868..65732a6 100644 (file)
--- a/src/edu/berkeley/sbp/ResultNode.java
+++ b/src/edu/berkeley/sbp/ResultNode.java
@@ -9,8 +9,8 @@ import java.util.*;
 final class ResultNode
     extends Node<StateNode> {
 
 final class ResultNode
     extends Node<StateNode> {
 

-    private Forest.Many f = new Forest.Many();

     private Pos reduction;
     private Pos reduction;

+    private Forest.Many f = new Forest.Many();

 
     public void merge(Forest newf) { this.f.merge(newf); }
     public Pos reduction() { return reduction; }
 
     public void merge(Forest newf) { this.f.merge(newf); }
     public Pos reduction() { return reduction; }

@@ -29,9 +29,9 @@ final class ResultNode
         super.destroy();
     }
 
         super.destroy();
     }
 

-    public void addPred(StateNode pred) {
+    protected void addPred(StateNode pred) {

         super.addPred(pred);
         super.addPred(pred);

-        // results have only one predecessor
+        // results should have at most one predecessor

         if (predecessors.size() > 1) throw new Error();
     }
         
         if (predecessors.size() > 1) throw new Error();
     }