Commit 57ca63cf authored by Romain Wallon's avatar Romain Wallon

Fixes a missing method and uses LBD-based restarts in resolution-based solvers

parent 9f33062a
Pipeline #8895 failed with stages
in 32 minutes and 49 seconds
......@@ -69,6 +69,11 @@ public class OrientedOrder implements IOrder {
}
}
@Override
public void updateVar(int p, double value) {
updateVar(p);
}
@Override
public void init() {
order.init();
......
......@@ -930,7 +930,7 @@ public final class SolverFactory extends ASolverFactory<IPBSolver> {
PBSolverResolution solver = newCompetPBResLongWLMixedConstraintsObjectiveExpSimp();
solver.setSimplifier(Solver.NO_SIMPLIFICATION);
solver.setRestartStrategy(new Glucose21Restarts());
solver.setLearnedConstraintsDeletionStrategy(solver.activity_based);
solver.setLearnedConstraintsDeletionStrategy(solver.lbd_based);
return solver;
}
......@@ -986,7 +986,7 @@ public final class SolverFactory extends ASolverFactory<IPBSolver> {
*/
public static IPBSolver newSimpleSimplification() {
PBSolverResolution solver = newCompetPBResWLMixedConstraintsObjectiveExpSimp();
solver.setLearnedConstraintsDeletionStrategy(solver.activity_based);
solver.setLearnedConstraintsDeletionStrategy(solver.lbd_based);
solver.setSimplifier(solver.SIMPLE_SIMPLIFICATION);
return solver;
}
......@@ -1000,7 +1000,7 @@ public final class SolverFactory extends ASolverFactory<IPBSolver> {
*/
public static IPBSolver newResolutionSimpleRestarts() {
PBSolverResolution solver = newCompetPBResLongWLMixedConstraintsObjectiveExpSimp();
solver.setLearnedConstraintsDeletionStrategy(solver.activity_based);
solver.setLearnedConstraintsDeletionStrategy(solver.lbd_based);
solver.setRestartStrategy(new MiniSATRestarts());
return solver;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment