Skip to content

GitLab

sat4j
sat4j
Commit 185a687f authored by Romain WALLON's avatar Romain WALLON
Browse files
Options

Adds the possibility to choose whether obvious divisions should be applied automatically

parent 040fd01d
Hide whitespace changes
Inline Side-by-side
Showing with 221 additions and 67 deletions
org.sat4j.pb/src/main/java/org/sat4j/pb/constraints/pb/AutoDivisionStrategy.java 0 → 100644
View file @ 185a687f
/*******************************************************************************
* SAT4J: a SATisfiability library for Java Copyright (C) 2004, 2012 Artois University and CNRS
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU Lesser General Public License Version 2.1 or later (the
* "LGPL"), in which case the provisions of the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of the LGPL, and not to allow others to use your version of
* this file under the terms of the EPL, indicate your decision by deleting
* the provisions above and replace them with the notice and other provisions
* required by the LGPL. If you do not delete the provisions above, a recipient
* may use your version of this file under the terms of the EPL or the LGPL.
*
* Based on the original MiniSat specification from:
*
* An extensible SAT solver. Niklas Een and Niklas Sorensson. Proceedings of the
* Sixth International Conference on Theory and Applications of Satisfiability
* Testing, LNCS 2919, pp 502-518, 2003.
*
* See www.minisat.se for the original solver in C++.
*
* Contributors:
* CRIL - initial API and implementation
*******************************************************************************/
package org.sat4j.pb.constraints.pb;
import java.math.BigInteger;
/**
* The AutoDivisionStrategy enables to specify whether division should be
* applied automatically, when a common factor is identified.
*
* @author Romain WALLON
*/
public enum AutoDivisionStrategy {
/**
* The DISABLED auto-division strategy.
*/
DISABLED {
@Override
boolean isCardinality(InternalMapPBStructure weightedLits) {
return false;
}
},
/**
* The DISABLED auto-division strategy.
*/
ENABLED {
@Override
boolean isCardinality(InternalMapPBStructure weightedLits) {
BigInteger value = weightedLits.getCoef(0);
for (int i = 1; i < weightedLits.size(); i++) {
if (!weightedLits.getCoef(i).equals(value)) {
return false;
}
}
return true;
}
};
/**
* Checks out if the constraint represented by {@code weightedLits} is a
* cardinality constraint.
*
* @param weightedLits
* The structure representing the constraint.
* @return If the constraint is a cardinality constraint.
*/
abstract boolean isCardinality(InternalMapPBStructure weightedLits);
/*
* (non-Javadoc)
*
* @see java.lang.Enum#toString()
*/
@Override
public String toString() {
return "Auto-division on coefficients is " + name().toLowerCase();
}
}
org.sat4j.pb/src/main/java/org/sat4j/pb/constraints/pb/ConflictMap.java
View file @ 185a687f
......@@ -53,7 +53,6 @@ public class ConflictMap extends MapPb implements IConflict {
protected long numberOfReductions = 0;
private boolean allowSkipping = false;
private boolean endingSkipping = true;
/**
* to store the slack of the current resolvant
*/
......@@ -89,27 +88,29 @@ public class ConflictMap extends MapPb implements IConflict {
boolean noRemove) {
return new ConflictMap(cpb, level, noRemove, false,
NoPostProcess.instance(), IWeakeningStrategy.UNASSIGNED_FIRST,
null);
AutoDivisionStrategy.ENABLED, null);
}
public static IConflict createConflict(PBConstr cpb, int level,
boolean noRemove, boolean skip, PBSolverStats stats) {
return new ConflictMap(cpb, level, noRemove, skip,
NoPostProcess.instance(), IWeakeningStrategy.UNASSIGNED_FIRST,
stats);
AutoDivisionStrategy.ENABLED, stats);
}
public static IConflict createConflict(PBConstr cpb, int level,
boolean noRemove, IPostProcess postProcessing) {
return new ConflictMap(cpb, level, noRemove, false, postProcessing,
IWeakeningStrategy.UNASSIGNED_FIRST, null);
IWeakeningStrategy.UNASSIGNED_FIRST,
AutoDivisionStrategy.ENABLED, null);
}
public static IConflict createConflict(PBConstr cpb, int level,
boolean noRemove, boolean skip, IPostProcess postProcessing,
IWeakeningStrategy weakeningStrategy, PBSolverStats stats) {
IWeakeningStrategy weakeningStrategy,
AutoDivisionStrategy autoDivisionStrategy, PBSolverStats stats) {
return new ConflictMap(cpb, level, noRemove, skip, postProcessing,
weakeningStrategy, stats);
weakeningStrategy, autoDivisionStrategy, stats);
}
public static IConflictFactory factory() {
......@@ -117,9 +118,12 @@ public class ConflictMap extends MapPb implements IConflict {
@Override
public IConflict createConflict(PBConstr cpb, int level,
boolean noRemove, boolean skip, IPostProcess postprocess,
IWeakeningStrategy weakeningStrategy, PBSolverStats stats) {
IWeakeningStrategy weakeningStrategy,
AutoDivisionStrategy autoDivisionStrategy,
PBSolverStats stats) {
return ConflictMap.createConflict(cpb, level, noRemove, skip,
postprocess, weakeningStrategy, stats);
postprocess, weakeningStrategy, autoDivisionStrategy,
stats);
}
@Override
......@@ -131,24 +135,27 @@ public class ConflictMap extends MapPb implements IConflict {
ConflictMap(PBConstr cpb, int level) {
this(cpb, level, false, false, NoPostProcess.instance(),
IWeakeningStrategy.UNASSIGNED_FIRST, null);
IWeakeningStrategy.UNASSIGNED_FIRST,
AutoDivisionStrategy.ENABLED, null);
}
ConflictMap(PBConstr cpb, int level, boolean noRemove) {
this(cpb, level, noRemove, false, NoPostProcess.instance(),
IWeakeningStrategy.UNASSIGNED_FIRST, null);
IWeakeningStrategy.UNASSIGNED_FIRST,
AutoDivisionStrategy.ENABLED, null);
}
ConflictMap(PBConstr cpb, int level, boolean noRemove, boolean skip,
PBSolverStats stats) {
this(cpb, level, noRemove, skip, NoPostProcess.instance(),
IWeakeningStrategy.UNASSIGNED_FIRST, stats);
IWeakeningStrategy.UNASSIGNED_FIRST,
AutoDivisionStrategy.ENABLED, stats);
}
ConflictMap(PBConstr cpb, int level, boolean noRemove, boolean skip,
IPostProcess postProcessing, IWeakeningStrategy weakeningStrategy,
PBSolverStats stats) {
super(cpb, level, noRemove);
AutoDivisionStrategy autoDivisionStrategy, PBSolverStats stats) {
super(cpb, level, noRemove, autoDivisionStrategy);
this.stats = stats;
this.allowSkipping = skip;
this.voc = cpb.getVocabulary();
......
org.sat4j.pb/src/main/java/org/sat4j/pb/constraints/pb/ConflictMapReduceByGCD.java
View file @ 185a687f
......@@ -14,23 +14,25 @@ public class ConflictMapReduceByGCD extends ConflictMap {
public ConflictMapReduceByGCD(PBConstr cpb, int level, boolean noRemove,
boolean skip, IPostProcess postProcessing,
IWeakeningStrategy weakeningStrategy, PBSolverStats stats) {
IWeakeningStrategy weakeningStrategy,
AutoDivisionStrategy autoDivisionStrategy, PBSolverStats stats) {
super(cpb, level, noRemove, skip, postProcessing, weakeningStrategy,
stats);
autoDivisionStrategy, stats);
}
public static IConflict createConflict(PBConstr cpb, int level,
PBSolverStats stats) {
return new ConflictMapReduceByGCD(cpb, level, true, false,
NoPostProcess.instance(), IWeakeningStrategy.UNASSIGNED_FIRST,
stats);
AutoDivisionStrategy.ENABLED, stats);
}
public static IConflict createConflict(PBConstr cpb, int level,
boolean noRemove, boolean skip, IPostProcess postprocess,
PBSolverStats stats) {
IWeakeningStrategy weakeningStrategy,
AutoDivisionStrategy autoDivisionStrategy, PBSolverStats stats) {
return new ConflictMapReduceByGCD(cpb, level, noRemove, skip,
postprocess, IWeakeningStrategy.UNASSIGNED_FIRST, stats);
postprocess, weakeningStrategy, autoDivisionStrategy, stats);
}
public static IConflictFactory factory() {
......@@ -38,9 +40,12 @@ public class ConflictMapReduceByGCD extends ConflictMap {
@Override
public IConflict createConflict(PBConstr cpb, int level,
boolean noRemove, boolean skip, IPostProcess postprocess,
IWeakeningStrategy weakeningStrategy, PBSolverStats stats) {
IWeakeningStrategy weakeningStrategy,
AutoDivisionStrategy autoDivisionStrategy,
PBSolverStats stats) {
return ConflictMapReduceByGCD.createConflict(cpb, level,
noRemove, skip, postprocess, weakeningStrategy, stats);
noRemove, skip, postprocess, weakeningStrategy,
autoDivisionStrategy, stats);
}
@Override
......
org.sat4j.pb/src/main/java/org/sat4j/pb/constraints/pb/ConflictMapReduceByPowersOf2.java
View file @ 185a687f
......@@ -6,16 +6,18 @@ public class ConflictMapReduceByPowersOf2 extends ConflictMap {
public ConflictMapReduceByPowersOf2(PBConstr cpb, int level,
boolean noRemove, boolean skip, IPostProcess postProcessing,
PBSolverStats stats) {
AutoDivisionStrategy autoDivisionStrategy, PBSolverStats stats) {
super(cpb, level, noRemove, skip, postProcessing,
IWeakeningStrategy.UNASSIGNED_FIRST, stats);
IWeakeningStrategy.UNASSIGNED_FIRST, autoDivisionStrategy,
stats);
}
public static IConflict createConflict(PBConstr cpb, int level,
boolean noRemove, boolean skip, IPostProcess postprocess,
PBSolverStats stats) {
IWeakeningStrategy weakeningStrategy,
AutoDivisionStrategy autoDivisionStrategy, PBSolverStats stats) {
return new ConflictMapReduceByPowersOf2(cpb, level, noRemove, skip,
postprocess, stats);
postprocess, autoDivisionStrategy, stats);
}
public static IConflictFactory factory() {
......@@ -23,9 +25,12 @@ public class ConflictMapReduceByPowersOf2 extends ConflictMap {
@Override
public IConflict createConflict(PBConstr cpb, int level,
boolean noRemove, boolean skip, IPostProcess postprocess,
IWeakeningStrategy weakeningStrategy, PBSolverStats stats) {
IWeakeningStrategy weakeningStrategy,
AutoDivisionStrategy autoDivisionStrategy,
PBSolverStats stats) {
return ConflictMapReduceByPowersOf2.createConflict(cpb, level,
noRemove, skip, postprocess, weakeningStrategy, stats);
noRemove, skip, postprocess, weakeningStrategy,
autoDivisionStrategy, stats);
}
@Override
......
org.sat4j.pb/src/main/java/org/sat4j/pb/constraints/pb/ConflictMapReduceToCard.java
View file @ 185a687f
......@@ -28,15 +28,18 @@ public class ConflictMapReduceToCard extends ConflictMap {
public ConflictMapReduceToCard(PBConstr cpb, int level, boolean noRemove,
boolean skip, IPostProcess postprocess,
IWeakeningStrategy weakeningStrategy, PBSolverStats stats) {
super(cpb, level, noRemove, skip, postprocess, weakeningStrategy, stats);
IWeakeningStrategy weakeningStrategy,
AutoDivisionStrategy autoDivisionStrategy, PBSolverStats stats) {
super(cpb, level, noRemove, skip, postprocess, weakeningStrategy,
autoDivisionStrategy, stats);
}
public static IConflict createConflict(PBConstr cpb, int level,
boolean noRemove, boolean skip, IPostProcess postprocess,
IWeakeningStrategy weakeningStrategy, PBSolverStats stats) {
IWeakeningStrategy weakeningStrategy,
AutoDivisionStrategy autoDivisionStrategy, PBSolverStats stats) {
return new ConflictMapReduceToCard(cpb, level, noRemove, skip,
postprocess, weakeningStrategy, stats);
postprocess, weakeningStrategy, autoDivisionStrategy, stats);
}
public static IConflict createConflict(PBConstr cpb, int level) {
......@@ -53,9 +56,12 @@ public class ConflictMapReduceToCard extends ConflictMap {
@Override
public IConflict createConflict(PBConstr cpb, int level,
boolean noRemove, boolean skip, IPostProcess postprocess,
IWeakeningStrategy weakeningStrategy, PBSolverStats stats) {
IWeakeningStrategy weakeningStrategy,
AutoDivisionStrategy autoDivisionStrategy,
PBSolverStats stats) {
return ConflictMapReduceToCard.createConflict(cpb, level,
noRemove, skip, postprocess, weakeningStrategy, stats);
noRemove, skip, postprocess, weakeningStrategy,
autoDivisionStrategy, stats);
}
@Override
......
org.sat4j.pb/src/main/java/org/sat4j/pb/constraints/pb/ConflictMapReduceToClause.java
View file @ 185a687f
......@@ -46,8 +46,10 @@ public final class ConflictMapReduceToClause extends ConflictMap {
public ConflictMapReduceToClause(PBConstr cpb, int level, boolean noRemove,
boolean skip, IPostProcess postprocess,
IWeakeningStrategy weakeningStrategy, PBSolverStats stats) {
super(cpb, level, noRemove, skip, postprocess, weakeningStrategy, stats);
IWeakeningStrategy weakeningStrategy,
AutoDivisionStrategy autoDivisionStrategy, PBSolverStats stats) {
super(cpb, level, noRemove, skip, postprocess, weakeningStrategy,
autoDivisionStrategy, stats);
}
public static IConflict createConflict(PBConstr cpb, int level,
......@@ -57,9 +59,10 @@ public final class ConflictMapReduceToClause extends ConflictMap {
public static IConflict createConflict(PBConstr cpb, int level,
boolean noRemove, boolean skip, IPostProcess postprocess,
IWeakeningStrategy weakeningStrategy, PBSolverStats stats) {
IWeakeningStrategy weakeningStrategy,
AutoDivisionStrategy autoDivisionStrategy, PBSolverStats stats) {
return new ConflictMapReduceToClause(cpb, level, noRemove, skip,
postprocess, weakeningStrategy, stats);
postprocess, weakeningStrategy, autoDivisionStrategy, stats);
}
public static IConflict createConflict(PBConstr cpb, int level) {
......@@ -71,9 +74,12 @@ public final class ConflictMapReduceToClause extends ConflictMap {
@Override
public IConflict createConflict(PBConstr cpb, int level,
boolean noRemove, boolean skip, IPostProcess postprocess,
IWeakeningStrategy weakeningStrategy, PBSolverStats stats) {
IWeakeningStrategy weakeningStrategy,
AutoDivisionStrategy autoDivisionStrategy,
PBSolverStats stats) {
return ConflictMapReduceToClause.createConflict(cpb, level,
noRemove, skip, postprocess, weakeningStrategy, stats);
noRemove, skip, postprocess, weakeningStrategy,
autoDivisionStrategy, stats);
}
@Override
......
org.sat4j.pb/src/main/java/org/sat4j/pb/constraints/pb/ConflictMapRounding.java
View file @ 185a687f
......@@ -55,16 +55,18 @@ public class ConflictMapRounding extends ConflictMap {
public ConflictMapRounding(PBConstr cpb, int level, boolean noRemove,
boolean skip, IPostProcess postProcessing,
IWeakeningStrategy weakeningStrategy, PBSolverStats stats) {
IWeakeningStrategy weakeningStrategy,
AutoDivisionStrategy autoDivisionStrategy, PBSolverStats stats) {
super(cpb, level, noRemove, skip, postProcessing, weakeningStrategy,
stats);
autoDivisionStrategy, stats);
}
public static IConflict createConflict(PBConstr cpb, int level,
boolean noRemove, boolean skip, IPostProcess postProcessing,
IWeakeningStrategy weakeningStrategy, PBSolverStats stats) {
IWeakeningStrategy weakeningStrategy,
AutoDivisionStrategy autoDivisionStrategy, PBSolverStats stats) {
return new ConflictMapRounding(cpb, level, noRemove, skip,
postProcessing, weakeningStrategy, stats);
postProcessing, weakeningStrategy, autoDivisionStrategy, stats);
}
public static IConflictFactory factory() {
......@@ -72,9 +74,12 @@ public class ConflictMapRounding extends ConflictMap {
@Override
public IConflict createConflict(PBConstr cpb, int level,
boolean noRemove, boolean skip, IPostProcess postprocess,
IWeakeningStrategy weakeningStrategy, PBSolverStats stats) {
IWeakeningStrategy weakeningStrategy,
AutoDivisionStrategy autoDivisionStrategy,
PBSolverStats stats) {
return ConflictMapRounding.createConflict(cpb, level, noRemove,
skip, postprocess, weakeningStrategy, stats);
skip, postprocess, weakeningStrategy,
autoDivisionStrategy, stats);
}
@Override
......
org.sat4j.pb/src/main/java/org/sat4j/pb/constraints/pb/IConflictFactory.java
View file @ 185a687f
......@@ -6,5 +6,6 @@ public interface IConflictFactory {
IConflict createConflict(PBConstr cpb, int level, boolean noRemove,
boolean skip, IPostProcess postprocess,
IWeakeningStrategy removeStrategy, PBSolverStats stats);
IWeakeningStrategy removeStrategy,
AutoDivisionStrategy autoDivisionStrategy, PBSolverStats stats);
}
org.sat4j.pb/src/main/java/org/sat4j/pb/constraints/pb/MapPb.java
View file @ 185a687f
......@@ -57,14 +57,19 @@ public class MapPb implements IDataStructurePB {
private BigInteger cardDegree;
MapPb(PBConstr cpb, int level, boolean noRemove) {
protected final AutoDivisionStrategy autoDivisionStrategy;
MapPb(PBConstr cpb, int level, boolean noRemove,
AutoDivisionStrategy autoDivisionStrategy) {
this.weightedLits = new InternalMapPBStructure(cpb, level, noRemove);
this.degree = this.weightedLits.getComputedDegree();
this.autoDivisionStrategy = autoDivisionStrategy;
}
MapPb(int size) {
this.weightedLits = new InternalMapPBStructure(size);
this.degree = BigInteger.ZERO;
this.autoDivisionStrategy = AutoDivisionStrategy.ENABLED;
}
// temporarily : just for the case where an InternalMapPBStructure
......@@ -72,6 +77,7 @@ public class MapPb implements IDataStructurePB {
public MapPb(IVecInt literals, IVec<BigInteger> coefs, BigInteger degree) {
this.weightedLits = new InternalMapPBStructure(literals, coefs);
this.degree = degree;
this.autoDivisionStrategy = AutoDivisionStrategy.ENABLED;
}
public int reduceCoeffsByPower2() {
......@@ -130,19 +136,20 @@ public class MapPb implements IDataStructurePB {
break;
}
}
if (newcase) {
return false;
/*BigInteger value = this.weightedLits.getCoef(0);
for (int i = 1; i < size(); i++) {
if (!this.weightedLits.getCoef(i).equals(value)) {
return false;
if (autoDivisionStrategy.isCardinality(this.weightedLits)) {
this.cpCardsReduction++;
BigInteger[] division = degree
.divideAndRemainder(this.weightedLits.getCoef(0));
if (!division[1].equals(BigInteger.ZERO)) {
division[0] = division[0].add(BigInteger.ONE);
}
this.cardDegree = division[0];
} else {
return false;
}
this.cpCardsReduction++;
BigInteger[] division = degree.divideAndRemainder(value);
if (!division[1].equals(BigInteger.ZERO))
division[0] = division[0].add(BigInteger.ONE);
this.cardDegree = division[0];*/
} else
this.cardDegree = degree;
return true;
......
org.sat4j.pb/src/main/java/org/sat4j/pb/core/PBSolverCP.java
View file @ 185a687f
......@@ -37,6 +37,7 @@ import org.sat4j.minisat.core.Pair;
import org.sat4j.minisat.core.RestartStrategy;
import org.sat4j.minisat.core.SearchParams;
import org.sat4j.minisat.restarts.MiniSATRestarts;
import org.sat4j.pb.constraints.pb.AutoDivisionStrategy;
import org.sat4j.pb.constraints.pb.ConflictMap;
import org.sat4j.pb.constraints.pb.IConflict;
import org.sat4j.pb.constraints.pb.IConflictFactory;
......@@ -74,6 +75,8 @@ public class PBSolverCP extends PBSolver {
private IWeakeningStrategy weakeningStrategy = IWeakeningStrategy.UNASSIGNED_FIRST;
private AutoDivisionStrategy autoDivisionStrategy = AutoDivisionStrategy.DISABLED;
/**
* @param acg
* @param learner
......@@ -197,7 +200,8 @@ public class PBSolverCP extends PBSolver {
protected IConflict chooseConflict(PBConstr myconfl, int level) {
return conflictFactory.createConflict(myconfl, level, noRemove,
skipAllow, postprocess, weakeningStrategy, stats);
skipAllow, postprocess, weakeningStrategy, autoDivisionStrategy,
stats);
}
@Override
......@@ -206,12 +210,13 @@ public class PBSolverCP extends PBSolver {
+ this.getClass().getName() + ")\n"
+ (this.noRemove ? ""
: prefix + " - Removing satisfied literals at a higher level before CP \n")
+ (this.skipAllow
? prefix + " - Skipping as much as possible cutting planes during analysis conflict- Jan Elffers's algorithm \n"
+ (this.skipAllow ? prefix
+ " - Skipping as much as possible cutting planes during analysis conflict- Jan Elffers's algorithm \n"
: "")
+ prefix + " - " + postprocess + "\n" + prefix + " - "
+ conflictFactory + "\n" + prefix + " - " + weakeningStrategy
+ "\n" + super.toString(prefix);
+ prefix + " - " + autoDivisionStrategy + "\n" + prefix + " - "
+ postprocess + "\n" + prefix + " - " + conflictFactory + "\n"
+ prefix + " - " + weakeningStrategy + "\n"
+ super.toString(prefix);
}
private final IVec<String> conflictVariables = new Vec<String>();
......@@ -272,4 +277,9 @@ public class PBSolverCP extends PBSolver {
this.weakeningStrategy = weakeningStrategy;
}
public void setAutoDivisionStrategy(
AutoDivisionStrategy autoDivisionStrategy) {
this.autoDivisionStrategy = autoDivisionStrategy;
}
}
org.sat4j.pb/src/main/java/org/sat4j/pb/core/PBSolverCPCardLearning.java
View file @ 185a687f
......@@ -33,6 +33,7 @@ import org.sat4j.minisat.core.IOrder;
import org.sat4j.minisat.core.LearningStrategy;
import org.sat4j.minisat.core.RestartStrategy;
import org.sat4j.minisat.core.SearchParams;
import org.sat4j.pb.constraints.pb.AutoDivisionStrategy;
import org.sat4j.pb.constraints.pb.ConflictMapReduceToClause;
import org.sat4j.pb.constraints.pb.IConflict;
import org.sat4j.pb.constraints.pb.IWeakeningStrategy;
......@@ -90,7 +91,8 @@ public class PBSolverCPCardLearning extends PBSolverCPLong {
protected IConflict chooseConflict(PBConstr myconfl, int level) {
return ConflictMapReduceToClause.createConflict(myconfl, level,
isNoRemove(), isSkipAllow(), PostProcessToCard.instance(),
IWeakeningStrategy.UNASSIGNED_FIRST, stats);
IWeakeningStrategy.UNASSIGNED_FIRST,
AutoDivisionStrategy.ENABLED, stats);
}
@Override
......
org.sat4j.pb/src/main/java/org/sat4j/pb/core/PBSolverCPClauseLearning.java
View file @ 185a687f
......@@ -33,6 +33,7 @@ import org.sat4j.minisat.core.IOrder;
import org.sat4j.minisat.core.LearningStrategy;
import org.sat4j.minisat.core.RestartStrategy;
import org.sat4j.minisat.core.SearchParams;
import org.sat4j.pb.constraints.pb.AutoDivisionStrategy;
import org.sat4j.pb.constraints.pb.ConflictMapReduceToClause;
import org.sat4j.pb.constraints.pb.IConflict;
import org.sat4j.pb.constraints.pb.IWeakeningStrategy;
......@@ -95,7 +96,8 @@ public class PBSolverCPClauseLearning extends PBSolverCPLong {
protected IConflict chooseConflict(PBConstr myconfl, int level) {
return ConflictMapReduceToClause.createConflict(myconfl, level,
isNoRemove(), isSkipAllow(), PostProcessToClause.instance(),
IWeakeningStrategy.UNASSIGNED_FIRST, stats);
IWeakeningStrategy.UNASSIGNED_FIRST,
AutoDivisionStrategy.ENABLED, stats);
}
@Override
......
org.sat4j.pb/src/main/java/org/sat4j/pb/core/PBSolverCPLongDivideBy2.java
View file @ 185a687f
......@@ -33,6 +33,7 @@ import org.sat4j.minisat.core.IOrder;
import org.sat4j.minisat.core.LearningStrategy;
import org.sat4j.minisat.core.RestartStrategy;
import org.sat4j.minisat.core.SearchParams;
import org.sat4j.pb.constraints.pb.AutoDivisionStrategy;
import org.sat4j.pb.constraints.pb.ConflictMap;
import org.sat4j.pb.constraints.pb.IConflict;
import org.sat4j.pb.constraints.pb.IWeakeningStrategy;
......@@ -90,7 +91,8 @@ public class PBSolverCPLongDivideBy2 extends PBSolverCPLong {
protected IConflict chooseConflict(PBConstr myconfl, int level) {
return ConflictMap.createConflict(myconfl, level, isNoRemove(),
isSkipAllow(), PostProcessDivideBy2.instance(),
IWeakeningStrategy.UNASSIGNED_FIRST, stats);
IWeakeningStrategy.UNASSIGNED_FIRST,
AutoDivisionStrategy.ENABLED, stats);
}
@Override
......
org.sat4j.pb/src/main/java/org/sat4j/pb/core/PBSolverCPLongDivideByGCD.java
View file @ 185a687f
......@@ -4,6 +4,7 @@ import org.sat4j.minisat.core.IOrder;
import org.sat4j.minisat.core.LearningStrategy;
import org.sat4j.minisat.core.RestartStrategy;
import org.sat4j.minisat.core.SearchParams;
import org.sat4j.pb.constraints.pb.AutoDivisionStrategy;
import org.sat4j.pb.constraints.pb.ConflictMap;
import org.sat4j.pb.constraints.pb.IConflict;
import org.sat4j.pb.constraints.pb.IWeakeningStrategy;
......@@ -67,7 +68,8 @@ public class PBSolverCPLongDivideByGCD extends PBSolverCPLong {
protected IConflict chooseConflict(PBConstr myconfl, int level) {
return ConflictMap.createConflict(myconfl, level, isNoRemove(),
isSkipAllow(), PostProcessDivideBy2.instance(),
IWeakeningStrategy.UNASSIGNED_FIRST, stats);
IWeakeningStrategy.UNASSIGNED_FIRST,
AutoDivisionStrategy.ENABLED, stats);
}
@Override
......
org.sat4j.sat/src/main/java/org/sat4j/sat/KTHLauncher.java
View file @ 185a687f
......@@ -21,6 +21,7 @@ import org.sat4j.pb.PBSolverHandle;
import org.sat4j.pb.PseudoOptDecorator;
import org.sat4j.pb.SolverFactory;
import org.sat4j.pb.constraints.PBMaxClauseCardConstrDataStructure;
import org.sat4j.pb.constraints.pb.AutoDivisionStrategy;
import org.sat4j.pb.constraints.pb.ConflictMapReduceByGCD;
import org.sat4j.pb.constraints.pb.ConflictMapReduceByPowersOf2;
import org.sat4j.pb.constraints.pb.ConflictMapReduceToCard;
......@@ -75,6 +76,7 @@ public class KTHLauncher {
"Detect cardinality constraints from original constraints. Legal value are never, preproc, inproc, lazy.");
options.addOption("natural", "natural-static-order", false,
"Use a static order for decisions, using the natural order of the variables, from 1 to n.");
options.addOption("autodiv", "auto-division", false, "Apply division automatically when a common factor is identified.");
Option op = options.getOption("coeflim");
op.setArgName("limit");
op = options.getOption("coeflim-small");
......@@ -144,7 +146,7 @@ public class KTHLauncher {
// by default
break;
case "preproc":
pbsolver = new PreprocCardConstrLearningSolver<IPBSolver>(
pbsolver = new PreprocCardConstrLearningSolver<>(
cpsolver);
break;
case "inproc":
......@@ -300,6 +302,9 @@ public class KTHLauncher {
if (line.hasOption("natural")) {
cpsolver.setOrder(new NaturalStaticOrder());