From dac355890ce94f5ec7204142aec9a33ad8f81214 Mon Sep 17 00:00:00 2001 From: adam Date: Sat, 7 Jan 2006 20:14:33 -0500 Subject: [PATCH] intermediate checkpoint darcs-hash:20060108011433-5007d-134a60b378e5912dd938349f73c4e6ec1a613a4d.gz --- src/edu/berkeley/sbp/Forest.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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; } } -- 1.7.10.4