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 a6cbd3a..8368673 100644 (file)
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -9,8 +9,7 @@ import java.lang.reflect.*;
 /** <font color=blue>a tree (or node in a tree); see jargon.txt for details</font> */
 public class Tree<T>
     extends PrintableTree<Tree<T>>
 /** <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;
 
     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 */
     private Tree<T> lifted() { return children[children.length-1]; }
 
     /** the number of children the tree has */

-    public int               numChildren() {
+    public int               size() {

         return lift
         return lift

-            ? (children.length-1)+lifted().numChildren()
+            ? (children.length-1)+lifted().size()

             : children.length;
     }
 
             : children.length;
     }
 

@@ -80,16 +79,4 @@ public class Tree<T>
     protected boolean ignoreSingleton() { return false; }
 
 
     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();
-        for(Tree t : this) n.edge(t, null);
-        return n;
-    }
-    public boolean isTransparent() { return false; }
-    public boolean isHidden() { return false; }
-

 }
 }