run.sh

@@ -27,6 +27,6 @@ INSTANCE=04157f716c1e9606c6a530657bf8f957-Kakuro-easy-125-ext.xml.hg_4.cnf
 
 # make -j 16 && mpirun --bind-to none -np 5 --allow-run-as-root ./light -i $DIR/$INSTANCE --share=1 --threads=4 --times=3600
 
-make -j 16 && mpirun --bind-to none -np 9 --allow-run-as-root ./light -i ./data/class_1_easy_10_0.cnf --share=1 --threads=16 --times=3600
+make -j 16 && mpirun --bind-to none -np 9 --allow-run-as-root valgrind ./light -i ./data/hard1.cnf --share=1 --threads=2 --times=3600
 
 #./light -i $DIR/$INSTANCE --share=1 --threads=16 --times=3600

src/solve.cpp

@@ -68,15 +68,13 @@ void light::init_workers() {
 }
 
 void light::diversity_workers() {
-
     for (int i = 0; i < OPT(threads); i++) {
-
-        if (OPT(shuffle)) {
-            if (i) workers[i]->configure("order_reset", (rank - 1) * OPT(threads) + i);
-        }
-
         if(worker_type == SAT) {
 
+            if (OPT(shuffle)) {
+                if (i) workers[i]->configure("order_reset", (rank - 1) * OPT(threads) + i);
+            }
+
             workers[i]->configure("stable", 1);
             workers[i]->configure("target", 2);
             workers[i]->configure("phase", 1);
@@ -120,6 +118,10 @@ void light::diversity_workers() {
             else if (i == 14)
                 workers[i]->configure("target", 2);
         } else {
+            
+            if (OPT(shuffle)) {
+                if (i) workers[i]->configure("order_reset", i);
+            }
 
             if (OPT(pakis)) {
                 if (i == 13 || i == 14 || i == 9)
@@ -157,6 +159,7 @@ void light::diversity_workers() {
                     workers[i]->configure("phase", 1);
             }
         }
+
         
         for (int j = 0; j < configure_name[i].size(); j++) {
             workers[i]->configure(configure_name[i][j], configure_val[i][j]);