X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FForest.java;h=cdf8a8b634784b7c40ae2c5cce62e0e716d0764d;hp=7d872adda98152a53979ae8ac47c438dda3615fd;hb=0e17670bcfa7b0fe8eb3a2cac81f4b080a09fc98;hpb=4b5b35b9dbcf29da663c72d12aaf6ac3d2083d27
diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index 7d872ad..cdf8a8b 100644
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -6,64 +6,71 @@ import java.io.*;
import java.util.*;
import java.lang.reflect.*;
-/** an efficient representation of a collection of trees (Tomita's shared packed parse forest) */
+/**
+ *
+ * An efficient representation of a collection of trees (Tomita's
+ * shared packed parse forest).
+ *
+ */
public abstract class Forest implements GraphViz.ToGraphViz {
-
/** assume that this forest contains exactly one tree and return it; otherwise throw an exception */
public abstract Tree expand1() throws Ambiguous;
/** expand this forest into a set of trees */
public void expand(HashSet> ht) { expand(ht, new HashSet>(), null); }
- /** create a new forest node */
- public static Forest create(Input.Region loc, T head, Forest[] children, boolean unwrap) {
- return new Body(loc, head, children, unwrap);
+ /** create a new forest */
+ public static Forest create(Input.Region loc, T head, Forest[] children, boolean lift) {
+ return new One(loc, head, children, lift);
}
// Package-Private //////////////////////////////////////////////////////////////////////////////
abstract void expand(HashSet> ht, HashSet> ignore, Tree bogus);
abstract void gather(HashSet> ignore);
+ abstract void edges(GraphViz.Node n);
+ boolean ambiguous() { return false; }
- public abstract void edges(GraphViz.Node n);
- public boolean ambiguous() { return false; }
- // Body //////////////////////////////////////////////////////////////////////////////
+ // One //////////////////////////////////////////////////////////////////////////////
- private static class Body extends Forest /* extends PrintableTree> implements */ {
+ /** A "single" forest with a head and child subforests */
+ private static class One extends Forest {
private final Input.Region location;
private final T head;
private final Forest[] children;
- private final boolean unwrap;
- private Body(Input.Region loc, T head, Forest[] children, boolean unwrap) {
+ /** if true, the last child's children are considered children of this node */
+ private final boolean lift;
+
+ private One(Input.Region loc, T head, Forest[] children, boolean lift) {
this.location = loc;
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 expand1() throws Ambiguous {
Tree[] ret = new Tree[children.length];
- for(int i=0; i(location, head, ret, unwrap);
+ for(int i=0; i(location, head, ret, lift);
}
- public void gather(HashSet> hf) {
+
+ void gather(HashSet> hf) {
hf.add(this);
for(Forest f : children) f.gather(hf);
}
- public void expand(HashSet> ht, HashSet> ignore, Tree bogus) {
+ void expand(HashSet> ht, HashSet> ignore, Tree 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[] ta, HashSet> ht, HashSet> ignore, Tree bogus) {
+ private void expand(final int i, Tree[] ta, HashSet> ht, HashSet> ignore, Tree bogus) {
if (i==children.length) {
- ht.add(new Tree(location, head, ta, unwrap));
+ ht.add(new Tree(location, head, ta, lift));
} else {
HashSet> ht2 = new HashSet>();
children[i].expand(ht2, ignore, bogus);
@@ -87,12 +94,12 @@ public abstract class Forest implements GraphViz.ToGraphViz {
edges(n);
return n;
}
- boolean edges = false;
+ boolean edges = false; // FIXME ??
public void edges(GraphViz.Node n) {
if (edges) return;
edges = true;
for(int i=0; i implements GraphViz.ToGraphViz {
}
- // Ref //////////////////////////////////////////////////////////////////////////////
+ // Many //////////////////////////////////////////////////////////////////////////////
+
+ /** An "ambiguity node"; this is immutable once it has been "looked at" */
+ static class Many extends Forest {
- /**
- * This class represents a partially complete collection of
- * forests to be viewed as a forest at some later date; once
- * viewed, it becomes immutable
- */
- static class Ref extends Forest {
- public HashSet parents = new HashSet();
+ HashSet parents = new HashSet();
private FastSet> hp = new FastSet>();
+ private boolean touched = false;
- public Ref() { }
+ public Many() { }
public Tree expand1() throws Ambiguous {
+ touched();
if (hp.size() > 1) {
HashSet> hf0 = new HashSet>();
Iterator> ih = hp.iterator();
@@ -139,31 +145,49 @@ public abstract class Forest implements GraphViz.ToGraphViz {
return hp.iterator().next().expand1();
}
- public void gather(HashSet> ht) {
+ void gather(HashSet> ht) {
+ touched();
ht.add(this);
for(Forest f : hp) f.gather(ht);
}
- public Forest resolve() { return this; }
- public void expand(HashSet> ht, HashSet> ignore, Tree bogus) {
- if (ignore.contains(this)) { ht.add(bogus); return; }
- for (Forest f : hp) f.expand(ht, ignore, bogus);
+ private void touched() {
+ if (touched) return;
+ touched = true;
+ /*
+ FastSet> f2 = new FastSet>();
+ for(Forest f : hp)
+ if (f instanceof Forest.One) f2.add(f);
+ else for(Forest ff : ((Forest.Many)f))
+ f2.add(ff);
+ hp = f2;
+ */
+ }
+ public boolean contains(Forest f) {
+ touched();
+ return hp.contains(f);
+ }
+ public void merge(Forest p) {
+ if (touched) throw new RuntimeException("attempt to merge() on a Forest.Many that has already been examined");
+ if (p==this) throw new RuntimeException("attempt to merge() a Forest.Many to itself!");
+ hp.add(p, true);
}
- public boolean contains(Forest f) { return hp.contains(f); }
- public void merge(Forest p) { if (p!=this) hp.add(p, true); }
- public boolean ambiguous() {
+ boolean ambiguous() {
+ touched();
if (hp.size()==0) return false;
if (hp.size()==1) return hp.iterator().next().ambiguous();
return true;
}
- // GraphViz, ToInt //////////////////////////////////////////////////////////////////////////////
- /*
- public int toInt() {
- if (hp.size()==1) return hp.iterator().next().toInt();
- return super.toInt();
+ void expand(HashSet> ht, HashSet> ignore, Tree bogus) {
+ touched();
+ if (ignore.contains(this)) { ht.add(bogus); return; }
+ for (Forest f : hp) f.expand(ht, ignore, bogus);
}
- */
+
+
+ // GraphViz, ToInt //////////////////////////////////////////////////////////////////////////////
+
public boolean isTransparent() { return hp.size()==1; }
public boolean isHidden() { return hp.size()==0; }
public void edges(GraphViz.Node n) {
@@ -171,7 +195,6 @@ public abstract class Forest implements GraphViz.ToGraphViz {
for(Forest f : hp) f.edges(n);
}
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);