Revert "Revert "activity,initialization: order by variable""

This reverts commit 3539e13.

Signed-off-by: Norbert Manthey <nmanthey@conp-solutions.com>

minisat/core/Solver.cc

@@ -94,7 +94,7 @@ static IntOption opt_ccmin_mode(_cat,
                                 IntRange(0, 3));
 static IntOption
 opt_phase_saving(_cat, "phase-saving", "Controls the level of phase saving (0=none, 1=limited, 2=full)", 2, IntRange(0, 2));
-static IntOption opt_init_act(_cat, "rnd-init", "Initial activity is 0:0, 1:random, 2:1000/v, 3:v", 0, IntRange(0, 3));
+static IntOption opt_init_act(_cat, "rnd-init", "Initial activity is 0:0, 1:random, 2:1000/v, 3:v", 2, IntRange(0, 3));
 static IntOption opt_init_act_init(_cat, "rnd-init-init", "Initial activity for rnd-init=2", 1000, IntRange(1, INT32_MAX));
 static IntOption opt_restart_first(_cat, "rfirst", "The base restart interval", 100, IntRange(1, INT32_MAX));
 static IntOption opt_restart_strategy(_cat, "restart", "How to schedule restarts (split,luby,dynamic)", 1, IntRange(1, 3));
@@ -3567,7 +3567,9 @@ void Solver::diversify(int rank, int size)
     /* use previous release configurations as first configs */
     if (rank == 1) {
         /* initialize activity as in v3 */
-        init_act = 2;
+        init_act = 0;
+        /* do not use necessary assignment */
+        nAssignment.setAttemptEvery(0);
     }
     if (rank == 2) {
         /* do not use SLS, and initialize activities as in v3 */