From: adam Date: Sun, 8 Jan 2006 01:14:33 +0000 (-0500) Subject: intermediate checkpoint X-Git-Tag: tag_for_25-Mar~420 X-Git-Url: http://git.megacz.com/?p=sbp.git;a=commitdiff_plain;h=dac355890ce94f5ec7204142aec9a33ad8f81214 intermediate checkpoint darcs-hash:20060108011433-5007d-134a60b378e5912dd938349f73c4e6ec1a613a4d.gz --- 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; } }