if an operation on canonical objects wants to use other canonical ops, it must supply...

diff --git a/Robust/src/Analysis/Disjoint/Canonical.java b/Robust/src/Analysis/Disjoint/Canonical.java
index 317a9b4f2f175ad9361b9efb11e9e82125b3ad62..3ef81361655447055577da9a4ee5fcc21ca51b59 100644 (file)
--- a/Robust/src/Analysis/Disjoint/Canonical.java
+++ b/Robust/src/Analysis/Disjoint/Canonical.java
@@ -569,7 +569,7 @@ abstract public class Canonical {
     }
     
     // otherwise, no cached result...    
-    ChangeSet out = new ChangeSet();
+    ChangeSet out = ChangeSet.factory();
 
     Iterator<ReachState> itrO = rsO.iterator();
     while( itrO.hasNext() ) {
@@ -615,14 +615,14 @@ abstract public class Canonical {
           out = 
             Canonical.union( out,
                              ChangeSet.factory( 
-                                 ChangeTuple.factory( o, theUnion ) 
+                                               ChangeTuple.factory( o, theUnion ) 
                                                 )
                              );
        }
       }
     }
 
-    out = (ChangeSet) makeCanonical( out );
+    assert out.isCanonical();
     op2result.put( op, out );
     return out;
   }