Result: mostly inert changes

[sbp.git] / src / edu / berkeley / sbp / Result.java

diff --git a/src/edu/berkeley/sbp/Result.java b/src/edu/berkeley/sbp/Result.java
index 7888625..9db5aee 100644 (file)
--- a/src/edu/berkeley/sbp/Result.java
+++ b/src/edu/berkeley/sbp/Result.java
@@ -1,15 +1,11 @@
 // Copyright 2006 all rights reserved; see LICENSE file for BSD-style license
 
 package edu.berkeley.sbp;
-import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.util.*;
-import edu.berkeley.sbp.Parser.Table.*;
 import edu.berkeley.sbp.Sequence.Position;
-import java.io.*;
 import java.util.*;
-import java.lang.reflect.*;
 
-class Result implements GraphViz.ToGraphViz {
+final class Result implements GraphViz.ToGraphViz {
 
     private Forest f;
     private Node parent;
@@ -17,21 +13,23 @@ class Result implements GraphViz.ToGraphViz {
     private Position reduction;
     private HashSet<Node> children = new HashSet<Node>();
     private boolean destroyed = false;
+    private int usedByNonDoomedNode = 0;
 
     public Position reduction() { return reduction; }
     public GSS.Phase phase() { return phase; }
     public Forest getForest() { return f; }
     public Node parent() { return parent; }
-    public void addChild(Node child) { children.add(child); }
-    public void removeChild(Node child) { children.remove(child); }
+    public void addChild(Node child) {
+        children.add(child);
+        usedByNonDoomedNode += child.state().doomed ? 0 : 1;
+    }
+    public void removeChild(Node child) {
+        children.remove(child);
+        usedByNonDoomedNode -= child.state().doomed ? 0 : 1;
+    }
 
     public boolean usedByAnyNode() { return children.size() > 0; }
-    public boolean usedByNonDoomedNode() {
-        for(Node n : children)
-            if (!n.state().doomed)
-                return true;
-        return false;
-    }
+    public boolean usedByNonDoomedNode() { return usedByNonDoomedNode > 0; }
 
     public String toString() { return super.toString()+"->"+parent(); }