X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FForest.java;h=cdf8a8b634784b7c40ae2c5cce62e0e716d0764d;hp=0fb10c6cbf3b442a36eb27f61bd4c4c59854cbfe;hb=0e17670bcfa7b0fe8eb3a2cac81f4b080a09fc98;hpb=fd03b595963d781ee0a86961631854d2b0089397
diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index 0fb10c6..cdf8a8b 100644
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -7,12 +7,13 @@ 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 implements GraphViz.ToGraphViz {
-
/** assume that this forest contains exactly one tree and return it; otherwise throw an exception */
public abstract Tree expand1() throws Ambiguous;
@@ -20,58 +21,56 @@ public abstract class Forest implements GraphViz.ToGraphViz {
public void expand(HashSet> ht) { expand(ht, new HashSet>(), null); }
/** create a new forest */
- public static Forest create(Input.Region loc, T head, Forest[] children, boolean unwrap) {
- return new One(loc, head, children, unwrap);
+ 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);
-
// One //////////////////////////////////////////////////////////////////////////////
/** A "single" forest with a head and child subforests */
- public static class One extends Forest {
+ private static class One extends Forest {
private final Input.Region location;
private final T head;
private final Forest[] children;
/** if true, the last child's children are considered children of this node */
- private final boolean unwrap;
+ private final boolean lift;
- private One(Input.Region loc, T head, Forest[] children, boolean unwrap) {
+ 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);
+ return new Tree(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);
}
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);
@@ -95,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 {
// Many //////////////////////////////////////////////////////////////////////////////
/** An "ambiguity node"; this is immutable once it has been "looked at" */
- public static class Many extends Forest implements Iterable> {
+ static class Many extends Forest {
HashSet parents = new HashSet();
private FastSet> hp = new FastSet>();
@@ -127,11 +126,6 @@ public abstract class Forest implements GraphViz.ToGraphViz {
public Many() { }
- public Iterator> iterator() {
- touched();
- return (Iterator>)(Object)hp.iterator(); // FIXME: fastset's iterator is not safe!
- }
-
public Tree expand1() throws Ambiguous {
touched();
if (hp.size() > 1) {
@@ -151,7 +145,7 @@ 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);
@@ -160,12 +154,14 @@ public abstract class Forest implements GraphViz.ToGraphViz {
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();
@@ -183,7 +179,7 @@ public abstract class Forest implements GraphViz.ToGraphViz {
return true;
}
- public void expand(HashSet> ht, HashSet> ignore, Tree bogus) {
+ 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);