X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FTree.java;h=836867398c03fe3192519d721a2810d4db7d9a02;hp=a6cbd3a01a76b73af94ca6f8d10e51a9457c5ba3;hb=f09d2abb95f106197aea99c345282c3bf0cd3717;hpb=2cc11837a52505dd9863bcd366240a8f229af294 diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java index a6cbd3a..8368673 100644 --- a/src/edu/berkeley/sbp/Tree.java +++ b/src/edu/berkeley/sbp/Tree.java @@ -9,8 +9,7 @@ import java.lang.reflect.*; /** a tree (or node in a tree); see jargon.txt for details */ public class Tree extends PrintableTree> - implements Iterable>, - GraphViz.ToGraphViz { + implements Iterable> { private final Input.Region location; private final T head; @@ -23,9 +22,9 @@ public class Tree private Tree 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; } @@ -80,16 +79,4 @@ public class Tree 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; } - }