checkpoint

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

diff --git a/src/edu/berkeley/sbp/Union.java b/src/edu/berkeley/sbp/Union.java
index 7274dae..9ac5e61 100644 (file)
--- a/src/edu/berkeley/sbp/Union.java
+++ b/src/edu/berkeley/sbp/Union.java
@@ -15,17 +15,17 @@ public class Union extends Element implements Iterable<Sequence> {
     private final List<Sequence> alternatives = new ArrayList<Sequence>();
 
     public Iterator<Sequence> iterator() { return alternatives.iterator(); }
-
-    void reachable(HashSet<Sequence.Position> h) { for(Sequence s : alternatives) s.reachable(h); }
+    public boolean contains(Sequence s) { return alternatives.contains(s); }
 
     Topology toAtom() {
-        if (alternatives.size()==0) return null;
+        if (alternatives.size()==0) throw new RuntimeException("cannot build an Atom from a Union with no productions");
         Topology ret = null;
         for(Sequence s : this) {
             Topology a = s.toAtom();
-            if (ret==null) ret = a.dup();
-            else           ret.add(a.dup());
+            if (ret==null) ret = a;
+            else           ret = ret.union(a);
         }
+        if (ret==null) throw new RuntimeException("confusion on " + this);
         return ret;
     }