X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FForest.java;h=7d872adda98152a53979ae8ac47c438dda3615fd;hp=0a20228acd563ee908532da57f962af4002d33ee;hb=4b5b35b9dbcf29da663c72d12aaf6ac3d2083d27;hpb=fc1e5069ec5401c425dd29b77b04285916b62d10

diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index 0a20228..7d872ad 100644
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -1,88 +1,110 @@
 package edu.berkeley.sbp;
 import edu.berkeley.sbp.*;
-import edu.berkeley.sbp.*;
+import edu.berkeley.sbp.Sequence.Position;
 import edu.berkeley.sbp.util.*;
 import java.io.*;
 import java.util.*;
 import java.lang.reflect.*;
 
 /** an efficient representation of a collection of trees (Tomita's shared packed parse forest) */
-public abstract class Forest<T> extends PrintableTree<Forest.Body<T>> implements Iterable<Forest.Body<T>> {
+public abstract class Forest<T> implements GraphViz.ToGraphViz {
+
 
     /** assume that this forest contains exactly one tree and return it; otherwise throw an exception */
-    public final Tree<T> expand1() throws Ambiguous, ParseFailed {
-        Iterator<Tree<T>> it = expand(true).iterator();
-        if (!it.hasNext()) throw new ParseFailed();
-        return it.next();
-    }
+    public abstract Tree<T> expand1() throws Ambiguous;
 
     /** expand this forest into a set of trees */
-    public abstract HashSet<Tree<T>>  expand(boolean toss);
+    public void expand(HashSet<Tree<T>> ht) { expand(ht, new HashSet<Forest<T>>(), null); }
 
-    static        <T> Forest<T> singleton(Input.Location loc)                       { return create(loc, null, new Forest[] { }, false, true); }
-    static        <T> Forest<T> singleton(Input.Location loc, Forest<T> body)       { return create(loc, null, new Forest[] { body },  false, true); }
-    static        <T> Forest<T> leaf(Input.Location loc, T tag) { return create(loc, tag, null, false, false); }
-    public static <T> Forest<T> create(Input.Location loc, T tag, Forest<T>[] tokens, boolean unwrap, boolean singleton) {
-        return new MultiForest<T>(loc, tag, tokens, unwrap, singleton);
+    /** create a new forest node */
+    public static <T> Forest<T> create(Input.Region loc, T head, Forest<T>[] children, boolean unwrap) {
+        return new Body<T>(loc, head, children, unwrap);
     }
 
+    // Package-Private //////////////////////////////////////////////////////////////////////////////
+
+    abstract void expand(HashSet<Tree<T>> ht, HashSet<Forest<T>> ignore, Tree<T> bogus);
+    abstract void gather(HashSet<Forest<T>> ignore);
+
+    public abstract void edges(GraphViz.Node n);
+    public boolean ambiguous() { return false; }
+
     // Body //////////////////////////////////////////////////////////////////////////////
 
-    protected static class Body<T> extends PrintableTree<Forest<T>> implements Iterable<Forest<T>> {
+    private static class Body<T> extends Forest<T> /* extends PrintableTree<Forest<T>> implements */ {
 
-        private final Input.Location    location;
-        private final T                 tag;
-        private final Forest<T>[]       tokens;
+        private final Input.Region      location;
+        private final T                 head;
+        private final Forest<T>[]       children;
         private final boolean           unwrap;
-        private final boolean           singleton;
 
-        private Body(Input.Location loc, T tag, Forest<T>[] tokens, boolean unwrap, boolean singleton) {
+        private Body(Input.Region loc, T head, Forest<T>[] children, boolean unwrap) {
             this.location = loc;
-            this.tag = tag;
-            this.tokens = tokens==null ? emptyForestArray : new Forest[tokens.length];
-            if (tokens != null) System.arraycopy(tokens, 0, this.tokens, 0, tokens.length);
-            if (tokens != null) for(int i=0; i<tokens.length; i++) if (tokens[i]==null) throw new Error(i+"");
+            this.head = head;
+            this.children = children==null ? emptyForestArray : new Forest[children.length];
+            if (children != null) System.arraycopy(children, 0, this.children, 0, children.length);
+            if (children != null) for(int i=0; i<children.length; i++) if (children[i]==null) throw new Error(i+"");
             this.unwrap = unwrap;
-            this.singleton = singleton;
         }
 
-        private HashSet<Tree<T>> expand(boolean toss, ArrayList<Tree<T>> toks, int i, HashSet<Tree<T>> h) {
-            if (singleton) {
-                for(Body<T> b : tokens[0]) b.expand(toss, toks, i, h);
-
-            } else if (i==tokens.length) {
-                h.add(new Tree<T>(null, tag, toks.toArray(tree_hint)));
-
-            } else if (unwrap && i==tokens.length-1) {
-                if (tokens[i] != null)
-                    for(Body b : tokens[i])
-                        b.expand(toss, toks, 0, h);
-
+        public Tree<T> expand1() throws Ambiguous {
+            Tree<T>[] ret = new Tree[children.length];
+            for(int i=0; i<children.length; i++)
+                ret[i] = children[i].expand1();
+            return new Tree<T>(location, head, ret, unwrap);
+        }
+        public void gather(HashSet<Forest<T>> hf) {
+            hf.add(this);
+            for(Forest<T> f : children) f.gather(hf);
+        }
+        public void expand(HashSet<Tree<T>> ht, HashSet<Forest<T>> ignore, Tree<T> bogus) {
+            if (ignore.contains(this)) { ht.add(bogus); return; }
+            expand(0, new Tree[children.length], ht, ignore, bogus);
+        }
+        public void expand(final int i, Tree<T>[] ta, HashSet<Tree<T>> ht, HashSet<Forest<T>> ignore, Tree<T> bogus) {
+            if (i==children.length) {
+                ht.add(new Tree<T>(location, head, ta, unwrap));
             } else {
-                boolean hit = false;
-                for(Tree<T> r : tokens[i].expand(toss)) {
-                    hit = true;
-                    int old = toks.size();
-                    toks.add(r);
-                    expand(toss, toks, i+1, h);
-                    while(toks.size() > old) toks.remove(toks.size()-1);
+                HashSet<Tree<T>> ht2 = new HashSet<Tree<T>>();
+                children[i].expand(ht2, ignore, bogus);
+                for(Tree<T> tc : ht2) {
+                    ta[i] = tc;
+                    expand(i+1, ta, ht, ignore, bogus);
+                    ta[i] = null;
                 }
-                //if (!hit) throw new Error();
             }
-            return h;
         }
 
-        void addTo(FastSet<Body> h) {
-            if (!singleton) h.add(this, true);
-            else for(Body b : tokens[0]) b.addTo(h);
+        // GraphViz, ToInt //////////////////////////////////////////////////////////////////////////////
+
+        public boolean isTransparent() { return false; }
+        public boolean isHidden() { return false; }
+        public GraphViz.Node toGraphViz(GraphViz gv) {
+            if (gv.hasNode(this)) return gv.createNode(this);
+            GraphViz.Node n = gv.createNode(this);
+            n.label = headToString()==null?"":headToString();
+            n.directed = true;
+            edges(n);
+            return n;
+        }
+        boolean edges = false;
+        public void edges(GraphViz.Node n) {
+            if (edges) return;
+            edges = true;
+            for(int i=0; i<children.length; i++) {
+                if (i==children.length-1 && unwrap && !children[i].ambiguous()) {
+                    children[i].edges(n);
+                } else {
+                    n.edge(children[i], null);
+                }
+            }
         }
 
-        protected String  headToString()         { return null; }
-        protected String  headToJava()           { return null; }
+        protected String  headToString()         { return head==null?null:head.toString(); }
+        protected String  headToJava()           { return "null"; }
         protected String  left()                 { return "{"; }
         protected String  right()                { return "}"; }
         protected boolean ignoreSingleton()      { return false; }
-        public    Iterator<Forest<T>> iterator() { return new ArrayIterator<Forest<T>>(tokens); }
     }
 
 
@@ -94,53 +116,80 @@ public abstract class Forest<T> extends PrintableTree<Forest.Body<T>> implements
      *  viewed, it becomes immutable
      */
     static class Ref<T> extends Forest<T> {
-        private FastSet<Forest> hp = new FastSet<Forest>();
-        private Forest res = null;
+        public HashSet<GSS.Phase.Node> parents = new HashSet<GSS.Phase.Node>();
+        private FastSet<Forest<T>> hp = new FastSet<Forest<T>>();
+
         public Ref() { }
-        public void merge(Forest p) {
-            if (res != null) throw new Error("already resolved!");
-            if (p==null) throw new Error();
-            if (p!=this) hp.add(p, true);
+
+        public Tree<T> expand1() throws Ambiguous {
+            if (hp.size() > 1) {
+                HashSet<Forest<T>> hf0 = new HashSet<Forest<T>>();
+                Iterator<Forest<T>> ih = hp.iterator();
+                ih.next().gather(hf0);
+                for(Forest<T> f : hp) {
+                    HashSet<Forest<T>> hf1 = new HashSet<Forest<T>>();
+                    f.gather(hf1);
+                    hf0.retainAll(hf1);
+                }
+                HashSet<Tree<T>> ht = new HashSet<Tree<T>>();
+                expand(ht, hf0, new Tree(null, "*"));
+                throw new Ambiguous((Forest<?>)this,
+                                    (HashSet<Tree<?>>)(Object)ht);
+            }
+            return hp.iterator().next().expand1();
         }
-        public Iterator<Body<T>> iterator() { return ((Forest<T>)resolve()).iterator(); }
-        public HashSet<Tree<T>> expand(boolean toss) { return resolve().expand(toss); }
-        public Forest resolve() {
-            if (hp==null) return res;
-            FastSet<Body> nh      = new FastSet<Body>();
-            for(Forest<?> p : hp)
-                for(Body<?> b : (Forest<?>)p)
-                    b.addTo(nh);
-            res = new MultiForest(nh);
-            hp = null;
-            return res;
+        
+        public void gather(HashSet<Forest<T>> ht) {
+            ht.add(this);
+            for(Forest<T> f : hp) f.gather(ht);
         }
-    }
 
-    // Implementations //////////////////////////////////////////////////////////////////////////////
+        public Forest resolve() { return this; }
+        public void expand(HashSet<Tree<T>> ht, HashSet<Forest<T>> ignore, Tree<T> bogus) {
+            if (ignore.contains(this)) { ht.add(bogus); return; }
+            for (Forest<T> f : hp) f.expand(ht, ignore, bogus);
+        }
+        public boolean contains(Forest f) { return hp.contains(f); }
+        public void merge(Forest p) { if (p!=this) hp.add(p, true); }
+        public boolean ambiguous() {
+            if (hp.size()==0) return false;
+            if (hp.size()==1) return hp.iterator().next().ambiguous();
+            return true;
+        }
 
-    private static class MultiForest<T> extends Forest<T> {
-        private final FastSet<Body<T>> results;
-        private MultiForest(FastSet<Body<T>> results) { this.results = results; }
-        public MultiForest(Input.Location loc, T tag, Forest<T>[] tokens, boolean unwrap, boolean singleton) {
-            this.results = new FastSet<Body<T>>(new Body(loc, tag, tokens, unwrap, singleton));
+        // GraphViz, ToInt //////////////////////////////////////////////////////////////////////////////
+        /*
+        public int toInt() {
+            if (hp.size()==1) return hp.iterator().next().toInt();
+            return super.toInt();
+        }
+        */
+        public boolean isTransparent() { return hp.size()==1; }
+        public boolean isHidden() { return hp.size()==0; }
+        public void edges(GraphViz.Node n) {
+            if (hp.size()==1) { hp.iterator().next().edges(n); return; }
+            for(Forest f : hp) f.edges(n);
         }
-        public Iterator<Body<T>> iterator() { return results.iterator(); }
-        public HashSet<Tree<T>> expand(boolean toss) {
-            HashSet<Tree<T>> ret = new HashSet<Tree<T>>();
-            for(Body<T> b : results)
-                ret.addAll(b.expand(toss, new ArrayList<Tree<T>>(), 0, new HashSet<Tree<T>>()));
-            if (toss && ret.size() > 1) throw new Ambiguous(this);
-            return ret;
+        public GraphViz.Node toGraphViz(GraphViz gv) {
+            //if (hp.size()==0) return null;
+            if (hp.size()==1) return hp.iterator().next().toGraphViz(gv);
+            if (gv.hasNode(this)) return gv.createNode(this);
+            GraphViz.Node n = gv.createNode(this);
+            n.label = "?";
+            n.color = "red";
+            for(Forest f : hp) n.edge(f, null);
+            return n;
         }
     }
 
     // Statics //////////////////////////////////////////////////////////////////////////////
 
     private static Tree[] tree_hint = new Tree[0];
+    private static String[] string_hint = new String[0];
     private static final Forest[] emptyForestArray = new Forest[0];
 
     protected String  headToString()    { return null; }
-    protected String  headToJava()      { return null; }
+    protected String  headToJava()      { return "null"; }
     protected String  left()            { return "<?"; }
     protected String  right()           { return "?>"; }
     protected boolean ignoreSingleton() { return true; }