Make n-ary union propagator idempotent (as promised)

git-svn-id: file:///Volumes/GecodeGitMigration/gecode-svn-mirror/gecode/trunk@15224 e85b7adc-8362-4630-8c63-7469d557c915

Author: guidotack

gecode/set/rel-op/union.hpp

@@ -267,7 +267,7 @@ namespace Gecode { namespace Set { namespace RelOp {
 
   template<class View0, class View1>
   ExecStatus
-  UnionN<View0,View1>::propagate(Space& home, const ModEventDelta& med) {
+  UnionN<View0,View1>::propagate(Space& home, const ModEventDelta& med) {    
     ModEvent me0 = View0::me(med);
     ModEvent me1 = View1::me(med);
     bool ubevent = Rel::testSetEventUB(me0, me1);
@@ -279,28 +279,33 @@ namespace Gecode { namespace Set { namespace RelOp {
     bool oldModified = false;
 
     do {
-      oldModified = modified;
-      modified = false;
-      if (modified || oldModified || ubevent)
-        GECODE_ES_CHECK(unionNXiUB(home, modified, x, y,unionOfDets));
-      if (modified || oldModified || ubevent)
-        GECODE_ES_CHECK(partitionNYUB(home, modified, x, y,unionOfDets));
-      if (modified || oldModified || anybevent)
-        GECODE_ES_CHECK(partitionNXiLB(home, modified, x, y,unionOfDets));
-      if (modified || oldModified || lbevent)
-        GECODE_ES_CHECK(partitionNYLB(home, modified, x, y,unionOfDets));
-      if (modified || oldModified || cardevent || ubevent)
-        GECODE_ES_CHECK(unionNCard(home, modified, x, y, unionOfDets));
-    } while (modified);
+      do {
+        oldModified = modified;
+        modified = false;
+        if (modified || oldModified || ubevent)
+          GECODE_ES_CHECK(unionNXiUB(home, modified, x, y,unionOfDets));
+        if (modified || oldModified || ubevent)
+          GECODE_ES_CHECK(partitionNYUB(home, modified, x, y,unionOfDets));
+        if (modified || oldModified || anybevent)
+          GECODE_ES_CHECK(partitionNXiLB(home, modified, x, y,unionOfDets));
+        if (modified || oldModified || lbevent)
+          GECODE_ES_CHECK(partitionNYLB(home, modified, x, y,unionOfDets));
+        if (modified || oldModified || cardevent || ubevent) {
+          GECODE_ES_CHECK(unionNCard(home, modified, x, y, unionOfDets));
+        }
+      } while (modified);
 
-    for(int i=0;i<x.size();i++){
-      //Do not reverse! Eats away the end of the array!
-      while (i<x.size() && x[i].assigned()) {
-        GlbRanges<View0> det(x[i]);
-        unionOfDets.includeI(home,det);
-        x.move_lst(i);
+      for(int i=0;i<x.size();i++){
+        //Do not reverse! Eats away the end of the array!
+        while (i<x.size() && x[i].assigned()) {
+          GlbRanges<View0> det(x[i]);
+          unionOfDets.includeI(home,det);
+          x.move_lst(i);
+          modified = true;
+        }
       }
-    }
+      
+    } while (modified);
     // When we run out of variables, make a final check and disolve:
     if (x.size()==0) {
       BndSetRanges all1(unionOfDets);

test/set/element.cpp

@@ -60,9 +60,7 @@ namespace Test { namespace Set {
     public:
       /// Create and register test
       ElementUnion(const char* t)
-        : SetTest(t,5,ds_12,false) {
-        disabled = false;
-      }
+        : SetTest(t,5,ds_12,false) {}
       /// %Test whether \a x is solution
       virtual bool solution(const SetAssignment& x) const {
         int selected = 0;

test/set/rel-op.cpp

@@ -187,8 +187,6 @@ namespace Test { namespace Set {
                   shared0 == 0 ? n0+1 : (shared0 <= 2 ? 3 : 2),ds_12,false)
         , sot(sot0), n(n0), shared(shared0), withConst(withConst0)
         , is(0,1) {
-        if (sot == Gecode::SOT_UNION)
-          disabled = false;
       }
       /// %Test whether \a x is solution
       bool solution(const SetAssignment& x) const {
@@ -382,8 +380,6 @@ namespace Test { namespace Set {
                   1,ds_12,false,n0)
         , sot(sot0), n(n0), withConst(withConst0)
         , is(0,1) {
-        if (sot == Gecode::SOT_UNION)
-          disabled = false;
       }
       /// %Test whether \a x is solution
       bool solution(const SetAssignment& x) const {