Skip to content

Commit

Permalink
Revert "activity,initialization: order by variable"
Browse files Browse the repository at this point in the history
This reverts commit d2c2b66.
  • Loading branch information
conp-solutions committed Apr 4, 2023
1 parent f0d57be commit 3539e13
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions minisat/core/Solver.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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", 2, IntRange(0, 3));
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_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));
Expand Down Expand Up @@ -3692,9 +3692,7 @@ void Solver::diversify(int rank, int size)
/* use previous release configurations as first configs */
if (rank == 1) {
/* initialize activity as in v3 */
init_act = 0;
/* do not use necessary assignment */
nAssignment.setAttemptEvery(0);
init_act = 2;
}
if (rank == 2) {
/* do not use SLS, and initialize activities as in v3 */
Expand Down

0 comments on commit 3539e13

Please sign in to comment.