checkpoint

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

diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index d2bfc4b..8368673 100644 (file)
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -6,11 +6,10 @@ import java.io.*;
 import java.util.*;
 import java.lang.reflect.*;
 
-/** a tree (or node in a tree); see jargon.txt for details */
+/** <font color=blue>a tree (or node in a tree); see jargon.txt for details</font> */
 public class Tree<T>
     extends PrintableTree<Tree<T>>
-    implements Iterable<Tree<T>>,
-               GraphViz.ToGraphViz {
+    implements Iterable<Tree<T>> {
 
     private final Input.Region location;
     private final T            head;
@@ -23,9 +22,9 @@ public class Tree<T>
     private Tree<T> lifted() { return children[children.length-1]; }
 
     /** the number of children the tree has */
-    public int               numChildren() {
+    public int               size() {
         return lift
-            ? (children.length-1)+lifted().numChildren()
+            ? (children.length-1)+lifted().size()
             : children.length;
     }
 
@@ -52,6 +51,8 @@ public class Tree<T>
 
     public Tree(Input.Region loc, T head)                     { this(loc, head, null); }
     public Tree(Input.Region loc, T head, Tree<T>[] children) { this(loc, head, children, false); }
+
+    /** package-private constructor, allows setting the "lift" bit */
     Tree(Input.Region loc, T head, Tree<T>[] children, boolean lift) {
         this.location = loc;
         this.head = head;
@@ -78,22 +79,4 @@ public class Tree<T>
     protected boolean ignoreSingleton() { return false; }
 
 
-    // ToGraphViz /////////////////////////////////////////////////////////////////////////////
-
-    public GraphViz.Node toGraphViz(GraphViz gv) {
-        if (gv.hasNode(this)) return gv.createNode(this);
-        GraphViz.Node n = gv.createNode(this);
-        n.label = head()==null ? "" : head().toString();
-        //n.color = "red";
-        for(Tree t : this) n.edge(t, null);
-        return n;
-    }
-    public boolean isTransparent() { return false; }
-    public boolean isHidden() { return false; }
-
-
-    // TreeFunctor /////////////////////////////////////////////////////////////////////////////
-
-    public static interface TreeFunctor<T,R> extends Functor<Iterable<Tree<T>>, R> { }
-    
 }