slight code improvements

diff --git a/Robust/src/Analysis/Disjoint/ReachSet.java b/Robust/src/Analysis/Disjoint/ReachSet.java
index 851eeeccce759c891b8768ea57320d0891a82e32..e7fe5134b9ebc4e1f7f010e3efb7e7c0c7100eeb 100644 (file)
--- a/Robust/src/Analysis/Disjoint/ReachSet.java
+++ b/Robust/src/Analysis/Disjoint/ReachSet.java
@@ -36,11 +36,13 @@ public class ReachSet extends Canonical {
     return out;
   }
 
-  public static ReachSet factory(ReachState state) {
-    assert state != null;
-    assert state.isCanonical();
+  public static ReachSet factory(ReachState... states) {
     ReachSet out = new ReachSet();
-    out.reachStates.add(state);
+    for( ReachState state : states ) {
+      assert state != null;
+      assert state.isCanonical();
+      out.reachStates.add(state);
+    }
     out = (ReachSet) Canonical.makeCanonical(out);
     return out;
   }

diff --git a/Robust/src/Analysis/Disjoint/ReachState.java b/Robust/src/Analysis/Disjoint/ReachState.java
index 4c41b55a9b91cad2ef32663876566c84107283f5..5cea5b85a33a41186f58370494119db1c658dbcd 100644 (file)
--- a/Robust/src/Analysis/Disjoint/ReachState.java
+++ b/Robust/src/Analysis/Disjoint/ReachState.java
@@ -73,7 +73,7 @@ public class ReachState extends Canonical {
   }
 
 
-  public Iterator iterator() {
+  public Iterator<ReachTuple> iterator() {
     return reachTuples.iterator();
   }