X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FTree.java;h=836867398c03fe3192519d721a2810d4db7d9a02;hb=111166986ad83b54d0cae5c03c2304d23e332f29;hp=2f72029d28b7e7bee810f1b6e7f80c585e7ee558;hpb=9b7ce1d3e4ac84ecd2d0f5f461b42c40f38e4783;p=sbp.git diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java index 2f72029..8368673 100644 --- 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 */ +/** 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,17 +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; } - - }