X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FForest.java;h=937a229420e2f26ea5d6489258aa41f9a773b365;hp=90c4e43b6a5fdd1c2ec95324461b4707794241c4;hb=acfe58223b9a0f78e64a14a1ca5d5998626ee3fe;hpb=d95659dd73e9dee2d18417535e4c7d5a010033b6

diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index 90c4e43..937a229 100644
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -7,12 +7,51 @@ 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.MyBody<T>>*/ implements Visitable<Forest.Body<T>>, IntegerMappable, GraphViz.ToGraphViz {
+public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/
+    implements Visitable<Forest.Body<T>>,
+               IntegerMappable,
+               GraphViz.ToGraphViz {
 
     private static int master_idx = 0;
     private final int idx = master_idx++;
     public int toInt() { return idx; }
 
+    public abstract void expand(TaskList tl, HashSet<Tree<T>> ht);
+    public abstract void gather(TaskList tl, HashSet<Tree<T>>[] ht, HashSet<Tree<T>> target);
+
+    public static class TaskList extends ArrayList<TaskList.Task> {
+        public interface Task {
+            public void perform();
+        }
+        public class ExpandTask implements Task {
+            private Forest f;
+            private HashSet hs;
+            public ExpandTask(Forest f, HashSet hs) { this.f = f; this.hs = hs; }
+            public void perform() { f.expand(TaskList.this, hs); }
+        }
+        public class GatherTask implements Task {
+            private Forest f;
+            private HashSet[] ht;
+            private HashSet hs;
+            public GatherTask(Forest f, HashSet<Tree<?>>[] ht, HashSet<Tree<?>> hs) { this.f = f; this.hs = hs; this.ht = ht;}
+            public void perform() { f.gather(TaskList.this, ht, hs); }
+        }
+        public void expand(Forest f, HashSet hs) {
+            add(new ExpandTask(f, hs));
+        }
+        public void gather(Forest f, HashSet[] ht, HashSet hs) {
+            add(new GatherTask(f, ht, hs));
+        }
+        public void run() {
+            while(true) {
+                if (isEmpty()) return;
+                Task task = get(size()-1);
+                remove(size()-1);
+                task.perform();
+            }
+        }
+    }
+
     /** assume that this forest contains exactly one tree and return it; otherwise throw an exception */
     public final Tree<T> expand1() throws Ambiguous, ParseFailed {
         try {
@@ -24,8 +63,15 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
 
     /** expand this forest into a set of trees */
     public HashSet<Tree<T>> expand(boolean toss) {
+        /*
         final HashSetTreeConsumer<T> ret = new HashSetTreeConsumer<T>();
         visit(new TreeMaker2<T>(toss, ret), null, null);
+        */
+        TaskList tl = new TaskList();
+        HashSet<Tree<T>> ret = new HashSet<Tree<T>>();
+        tl.expand(this, ret);
+        tl.run();
+
         if (toss && ret.size() > 1) throw new InnerAmbiguous(this);
         return ret;
     }
@@ -35,22 +81,24 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
         public InnerAmbiguous(Forest<?> f) { this.f = f; }
     }
 
-    public static interface TreeConsumer<T> {
+    static interface TreeConsumer<T> {
         public void addTree(Tree<T> t);
     }
-    public static class HashSetTreeConsumer<T> extends HashSet<Tree<T>> implements TreeConsumer<T> {
-        public void addTree(Tree<T> t) { super.add(t); }
+    static class HashSetTreeConsumer<T> extends HashSet<Tree<T>> implements TreeConsumer<T> {
+        public void addTree(Tree<T> t) {
+            super.add(t);
+        }
     }
 
     static        <T> Forest<T> singleton(Input.Location loc, Position p) {
-        return create(loc, null, new Forest[] { }, false, true, p); }
+        return create(loc, null, new Forest[] { }, new Object[0], false, true, p); }
     static        <T> Forest<T> singleton(Input.Location loc, Forest<T> body, Position p) {
         //return create(loc, null, new Forest[] { body },  false, true, p);
         return body;
     }
-    static        <T> Forest<T> leaf(Input.Location loc, T tag, Position p) { return create(loc, tag, null, false, false, p); }
-    public static <T> Forest<T> create(Input.Location loc, T tag, Forest<T>[] tokens, boolean unwrap, boolean singleton, Position p) {
-        return new MyBody<T>(loc, tag, tokens, unwrap, singleton, p);
+    static        <T> Forest<T> leaf(Input.Location loc, T tag, Position p) { return create(loc, tag, null, null, false, false, p); }
+    public static <T> Forest<T> create(Input.Location loc, T tag, Forest<T>[] tokens, Object[] labels, boolean unwrap, boolean singleton, Position p) {
+        return new MyBody<T>(loc, tag, tokens, labels, unwrap, singleton, p);
     }
     // Body //////////////////////////////////////////////////////////////////////////////
 
@@ -58,6 +106,7 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
         void expand(int i, TreeMaker<T> h);
     }
     public abstract void edges(GraphViz.Node n);
+    public boolean ambiguous() { return false; }
     protected static class MyBody<T> extends Forest<T> implements Body<T> /* extends PrintableTree<Forest<T>> implements */ {
 
         public boolean isTransparent() { return false; }
@@ -67,6 +116,7 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
             GraphViz.Node n = gv.createNode(this);
             n.label = headToString()==null?"":headToString();
             n.directed = true;
+            n.comment = reduction==null?null:reduction+"";
             edges(n);
             return n;
         }
@@ -75,10 +125,10 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
             if (edges) return;
             edges = true;
             for(int i=0; i<tokens.length; i++) {
-                if (i==tokens.length-1 && unwrap) {
+                if (i==tokens.length-1 && unwrap && !tokens[i].ambiguous()) {
                     tokens[i].edges(n);
                 } else {
-                    n.edge(tokens[i]);
+                    n.edge(tokens[i], labels==null?null:labels[i]);
                 }
             }
         }
@@ -90,11 +140,12 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
         private final Input.Location    location;
         private final T                 tag;
         private final Forest<T>[]       tokens;
+        private final Object[]          labels;
         private final boolean           unwrap;
         private final boolean           singleton;
         private final Sequence.Position reduction;
 
-        private MyBody(Input.Location loc, T tag, Forest<T>[] tokens, boolean unwrap, boolean singleton, Position reduction) {
+        private MyBody(Input.Location loc, T tag, Forest<T>[] tokens, Object[] labels, boolean unwrap, boolean singleton, Position reduction) {
             this.location = loc;
             this.tag = tag;
             this.tokens = tokens==null ? emptyForestArray : new Forest[tokens.length];
@@ -103,6 +154,42 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
             this.unwrap = unwrap;
             this.singleton = singleton;
             this.reduction = reduction;
+            this.labels = labels;
+        }
+        public void gather(TaskList tl, HashSet<Tree<T>>[] ht, HashSet<Tree<T>> target) {
+            gather(tl, ht, target, new Tree[ht.length], 0);
+        }
+        private void gather(TaskList tl, HashSet<Tree<T>>[] ht, HashSet<Tree<T>> target, Tree[] trees, int i) {
+            if (i==ht.length) {
+                target.add(new Tree<T>(null, tag, trees));
+                return;
+            }
+            for(Tree<T> tree : ht[i]) {
+                if (unwrap && i==trees.length-1) {
+                    // I think this is wrong
+                    Tree[] trees2 = new Tree[trees.length - 1 + tree.numChildren()];
+                    System.arraycopy(trees, 0, trees2, 0, trees.length-1);
+                    for(int j=0; j<tree.numChildren(); j++)
+                        trees2[trees.length-1+j] = tree.child(j);
+                    target.add(new Tree<T>(null, tag, trees2));
+                } else {
+                    trees[i] = tree;
+                    gather(tl, ht, target, trees, i+1);
+                    trees[i] = null;
+                }
+            }
+        }
+        public void expand(TaskList tl, HashSet<Tree<T>> ht) {
+            if (singleton) {
+                tokens[0].expand(tl, ht);
+                return;
+            }
+            HashSet<Tree<T>>[] children = new HashSet[tokens.length];
+            tl.gather(this, children, ht);
+            for(int i=0; i<children.length; i++) {
+                children[i] = new HashSet<Tree<T>>();
+                tl.expand(tokens[i], children[i]);
+            }
         }
 
         public void expand(final int i, final TreeMaker<T> h) {
@@ -122,12 +209,13 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
             } else {
                 tokens[i].visit(new TreeMaker<T>(h.toss) {
                     public void start(T head, Input.Location loc) { }
-                    public void addTree(Tree<T> t) { toks.add(t); }
+                    public void addTree(Tree<T> t, Object label) { toks.add(t); labs.add(label); }
                     public void finish(T head, Input.Location loc) {
                         int old = h.toks.size();
-                        h.addTree(new Tree<T>(loc, head, toks.toArray(tree_hint)));
+                        h.addTree(new Tree<T>(loc, head, toks.toArray(tree_hint), labs.toArray(string_hint)), labels==null?null:labels[i]);
                         expand(i+1, h);
                         while(h.toks.size() > old) h.toks.remove(h.toks.size()-1);
+                        while(h.labs.size() > old) h.labs.remove(h.labs.size()-1);
                     }
                 }, null, null);
             }
@@ -149,6 +237,21 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
      *  viewed, it becomes immutable
      */
     static class Ref<T> extends Forest<T> {
+        public void expand(TaskList tl, HashSet<Tree<T>> ht) {
+            for (Forest<T> f : hp) f.expand(tl, ht);
+        }
+        public void gather(TaskList tl, HashSet<Tree<T>>[] ht, HashSet<Tree<T>> target) {
+            throw new Error();
+        }
+        public HashSet<GSS.Phase.Node> parents = new HashSet<GSS.Phase.Node>();
+        public boolean contains(Forest f) {
+            return hp.contains(f);
+        }
+        public boolean ambiguous() {
+            if (hp.size()==0) return false;
+            if (hp.size()==1) return hp.iterator().next().ambiguous();
+            return true;
+        }
         private FastSet<Forest<T>> hp = new FastSet<Forest<T>>();
         public Ref() { }
         public int toInt() {
@@ -159,15 +262,18 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
 
         public boolean isTransparent() { return hp.size()==1; }
         public boolean isHidden() { return hp.size()==0; }
-        public void edges(GraphViz.Node n) { for(Forest f : hp) f.edges(n); }
+        public void edges(GraphViz.Node n) {
+            if (hp.size()==1) { hp.iterator().next().edges(n); return; }
+            for(Forest f : hp) f.edges(n);
+        }
         public GraphViz.Node toGraphViz(GraphViz gv) {
-            if (hp.size()==0) return null;
+            //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);
+            for(Forest f : hp) n.edge(f, null);
             return n;
         }
 
@@ -183,24 +289,28 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
     private static class TreeMaker2<T> extends TreeMaker<T> {
         private TreeConsumer<T> tc;
         public TreeMaker2(boolean toss, TreeConsumer<T> tc) { super(toss); this.tc = tc; }
-        public void finish(T head, Input.Location loc) { tc.addTree(new Tree<T>(loc, head, toks.toArray(tree_hint)));; }
+        public void finish(T head, Input.Location loc) { tc.addTree(new Tree<T>(loc, head, toks.toArray(tree_hint), labs.toArray(string_hint)));; }
         public void start(T head, Input.Location loc) { }
-        public void addTree(Tree<T> t) { toks.add(t); }
+        public void addTree(Tree<T> t, Object label) { toks.add(t); labs.add(label); }
     }
-    private static abstract class TreeMaker<T> implements Invokable<Forest.Body<T>,Boolean,Integer>, TreeConsumer<T> {
+    private static abstract class TreeMaker<T> implements Invokable<Forest.Body<T>,Boolean,Integer>/*, TreeConsumer<T>*/ {
         public ArrayList<Tree<T>> toks = new ArrayList<Tree<T>>();
+        public ArrayList<Object>  labs = new ArrayList<Object>();
         private boolean toss;
         protected T head;
         public TreeMaker(boolean toss) { this.toss = toss; }
         public abstract void start(T head, Input.Location loc);
         public abstract void finish(T head, Input.Location loc);
-        public abstract void addTree(Tree<T> t);
+        public abstract void addTree(Tree<T> t, Object label);
         public void invoke(Forest.Body<T> bod, Boolean o, Integer i) {
             if (i==null) {
                 ArrayList<Tree<T>> toks = this.toks;
                 this.toks = new ArrayList<Tree<T>>();
+                ArrayList<Object> labs = this.labs;
+                this.labs = new ArrayList<Object>();
                 bod.expand(0, this);
                 this.toks = toks;
+                this.labs = labs;
             } else {
                 bod.expand(i, this);
             }
@@ -210,6 +320,7 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
     // 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; }