X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FForest.java;h=6ac1e4b81cb5281a3ac9f755b026b04dcb1d64dd;hp=ed1c9aca4cec39a673b85e48edc65f715b41d478;hb=21740a3a499b34210969ad5f06a1b1dbd80145f3;hpb=ea98ead8a9a46a7314da6faac96a31bfecd7002b diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java index ed1c9ac..6ac1e4b 100644 --- a/src/edu/berkeley/sbp/Forest.java +++ b/src/edu/berkeley/sbp/Forest.java @@ -144,7 +144,7 @@ public abstract class Forest { } public Iterator> iterator() { return ((IterableForest)resolve()).iterator(); } public HashSet> expand(boolean toss) { return resolve().expand(toss); } - public boolean valid() { resolve(); return valid; } + public boolean valid() { if (valid) return true; resolve(); return valid; } public String toString() { return resolve().toString(); } public Forest resolve() { if (hp==null) return res; @@ -156,11 +156,13 @@ public abstract class Forest { else results = new HashSet(); } if (results != null) { - for(Forest p : hp) for(Body b : (IterableForest)p) results.add(b); + for(Forest p : hp) + for(Body b : (IterableForest)p) + results.add(b); for(Body b : results) { if (b.keep() && (b.creator==null || !b.creator.lame)) continue; - if (!b.keep(results)) continue; if (b.creator!=null && b.creator.lame) continue; + if (!b.keep(results)) continue; valid = true; b.addTo(nh); }