Fixed crashes with portfolios

git-svn-id: svn+ssh://svn.gecode.org/srv/gecode/svn/gecode/trunk@15620 64335634-5103-0410-b293-fc3d331e086d

Author: Christian Schulte

changelog.in

@@ -72,6 +72,14 @@ Date: ???
 [DESCRIPTION]
 Minor release.
 
+[ENTRY]
+Module: search
+What:   bug
+Rank:   major
+[DESCRIPTION]
+Fixed crashes in sequential and parallel portfolios using
+parallel or restart-based best solution search engines as assets.
+
 [ENTRY]
 Module: kernel
 What:   new

gecode/search/meta/rbs.cpp

@@ -90,7 +90,7 @@ namespace Gecode { namespace Search { namespace Meta {
         // The engine found a solution
         restart = true;
         delete last;
-        last = n->clone();
+        last = n->clone(shared_data);
         return n;
       } else if ( (!complete && !e->stopped()) ||
                   (e->stopped() && stop->enginestopped()) ) {
@@ -135,7 +135,7 @@ namespace Gecode { namespace Search { namespace Meta {
         return;
       }
     }
-    last = b.clone();
+    last = b.clone(shared_data);
     master->constrain(b);
     e->constrain(b);
   }

gecode/search/parallel/bab.cpp

@@ -65,7 +65,7 @@ namespace Gecode { namespace Search { namespace Parallel {
       }
       delete best;
     }
-    best = b.clone();
+    best = b.clone(false);
     // Announce better solutions
     for (unsigned int i=0; i<workers(); i++)
       worker(i)->better(best);

test/search.cpp

@@ -784,7 +784,7 @@ namespace Test {
           }
         // Portfolio-based search using SEBs
         for (unsigned int mt=1; mt<=3; mt += 2)
-          for (unsigned int st=1; st<=2; st++) {
+          for (unsigned int st=1; st<=8; st++) {
             (void) new SEBPBS<HasSolutions>("BAB",true,mt,st);
             (void) new SEBPBS<FailImmediate>("BAB",true,mt,st);
             (void) new SEBPBS<SolveImmediate>("BAB",true,mt,st);