X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FForest.java;h=ef420a8379e4991bd0b488278d8e67748a54732c;hp=8ed6eb503342eb8ba6763d7739c552df4dfe36e3;hb=dac355890ce94f5ec7204142aec9a33ad8f81214;hpb=14e2fc1b5414cbc270b81b12e47b149ad3275a49 diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java index 8ed6eb5..ef420a8 100644 --- a/src/edu/berkeley/sbp/Forest.java +++ b/src/edu/berkeley/sbp/Forest.java @@ -159,8 +159,9 @@ public abstract class Forest { public String toString() { return resolve().toString(); } public Forest resolve() { if (hp==null) return res; - HashSet results = null; FastSet nh = new FastSet(); + /* + HashSet results = null; for(Forest p : hp) for(Body b : (IterableForest)p) { if (b.keep() && (b.creator==null || !b.creator.lame)) { @@ -183,7 +184,13 @@ public abstract class Forest { } } hp = null; - res = new MultiForest(nh, valid); + */ + for(Forest p : hp) + for(Body b : (IterableForest)p) + if (b.creator==null || !b.creator.lame) + b.addTo(nh); + res = new MultiForest(nh, nh.size()>0); + hp = null; return res; } }