Commit 53fc413b authored by Romain WALLON's avatar Romain WALLON

Cleans up unused constructors, methods and variables.

parent 185a687f
Pipeline #380 passed with stages
in 26 minutes and 54 seconds
......@@ -4,14 +4,6 @@ import org.sat4j.pb.core.PBSolverStats;
public class ConflictMapReduceByGCD extends ConflictMap {
public ConflictMapReduceByGCD(PBConstr cpb, int level) {
super(cpb, level);
}
public ConflictMapReduceByGCD(PBConstr cpb, int level, boolean noRemove) {
super(cpb, level, noRemove);
}
public ConflictMapReduceByGCD(PBConstr cpb, int level, boolean noRemove,
boolean skip, IPostProcess postProcessing,
IWeakeningStrategy weakeningStrategy,
......@@ -20,13 +12,6 @@ public class ConflictMapReduceByGCD extends ConflictMap {
autoDivisionStrategy, stats);
}
public static IConflict createConflict(PBConstr cpb, int level,
PBSolverStats stats) {
return new ConflictMapReduceByGCD(cpb, level, true, false,
NoPostProcess.instance(), IWeakeningStrategy.UNASSIGNED_FIRST,
AutoDivisionStrategy.ENABLED, stats);
}
public static IConflict createConflict(PBConstr cpb, int level,
boolean noRemove, boolean skip, IPostProcess postprocess,
IWeakeningStrategy weakeningStrategy,
......
......@@ -5,11 +5,11 @@ import org.sat4j.pb.core.PBSolverStats;
public class ConflictMapReduceByPowersOf2 extends ConflictMap {
public ConflictMapReduceByPowersOf2(PBConstr cpb, int level,
boolean noRemove, boolean skip, IPostProcess postProcessing,
boolean noRemove, boolean skip,
IWeakeningStrategy weakeningStrategy, IPostProcess postProcessing,
AutoDivisionStrategy autoDivisionStrategy, PBSolverStats stats) {
super(cpb, level, noRemove, skip, postProcessing,
IWeakeningStrategy.UNASSIGNED_FIRST, autoDivisionStrategy,
stats);
super(cpb, level, noRemove, skip, postProcessing, weakeningStrategy,
autoDivisionStrategy, stats);
}
public static IConflict createConflict(PBConstr cpb, int level,
......@@ -17,7 +17,7 @@ public class ConflictMapReduceByPowersOf2 extends ConflictMap {
IWeakeningStrategy weakeningStrategy,
AutoDivisionStrategy autoDivisionStrategy, PBSolverStats stats) {
return new ConflictMapReduceByPowersOf2(cpb, level, noRemove, skip,
postprocess, autoDivisionStrategy, stats);
weakeningStrategy, postprocess, autoDivisionStrategy, stats);
}
public static IConflictFactory factory() {
......
......@@ -18,14 +18,6 @@ public class ConflictMapReduceToCard extends ConflictMap {
public static final BigInteger MAXVALUE = BigInteger
.valueOf(Long.MAX_VALUE);
public ConflictMapReduceToCard(PBConstr cpb, int level) {
super(cpb, level);
}
public ConflictMapReduceToCard(PBConstr cpb, int level, boolean noRemove) {
super(cpb, level, noRemove);
}
public ConflictMapReduceToCard(PBConstr cpb, int level, boolean noRemove,
boolean skip, IPostProcess postprocess,
IWeakeningStrategy weakeningStrategy,
......@@ -42,15 +34,6 @@ public class ConflictMapReduceToCard extends ConflictMap {
postprocess, weakeningStrategy, autoDivisionStrategy, stats);
}
public static IConflict createConflict(PBConstr cpb, int level) {
return new ConflictMapReduceToCard(cpb, level);
}
public static IConflict createConflict(PBConstr cpb, int level,
boolean noRemove) {
return new ConflictMapReduceToCard(cpb, level, noRemove);
}
public static IConflictFactory factory() {
return new IConflictFactory() {
@Override
......
......@@ -35,15 +35,6 @@ import org.sat4j.pb.core.PBSolverStats;
public final class ConflictMapReduceToClause extends ConflictMap {
public ConflictMapReduceToClause(PBConstr cpb, int level) {
super(cpb, level);
}
public ConflictMapReduceToClause(PBConstr cpb, int level,
boolean noRemove) {
super(cpb, level, noRemove);
}
public ConflictMapReduceToClause(PBConstr cpb, int level, boolean noRemove,
boolean skip, IPostProcess postprocess,
IWeakeningStrategy weakeningStrategy,
......@@ -52,11 +43,6 @@ public final class ConflictMapReduceToClause extends ConflictMap {
autoDivisionStrategy, stats);
}
public static IConflict createConflict(PBConstr cpb, int level,
boolean noRemove) {
return new ConflictMapReduceToClause(cpb, level, noRemove);
}
public static IConflict createConflict(PBConstr cpb, int level,
boolean noRemove, boolean skip, IPostProcess postprocess,
IWeakeningStrategy weakeningStrategy,
......@@ -65,10 +51,6 @@ public final class ConflictMapReduceToClause extends ConflictMap {
postprocess, weakeningStrategy, autoDivisionStrategy, stats);
}
public static IConflict createConflict(PBConstr cpb, int level) {
return new ConflictMapReduceToClause(cpb, level);
}
public static IConflictFactory factory() {
return new IConflictFactory() {
@Override
......
......@@ -35,24 +35,6 @@ import org.sat4j.pb.core.PBSolverStats;
public class ConflictMapRounding extends ConflictMap {
/**
* @param cpb
* @param level
*/
public ConflictMapRounding(PBConstr cpb, int level, PBSolverStats stats) {
super(cpb, level);
}
/**
* @param cpb
* @param level
* @param noRemove
*/
public ConflictMapRounding(PBConstr cpb, int level, boolean noRemove,
PBSolverStats stats) {
super(cpb, level, noRemove);
}
public ConflictMapRounding(PBConstr cpb, int level, boolean noRemove,
boolean skip, IPostProcess postProcessing,
IWeakeningStrategy weakeningStrategy,
......
......@@ -39,10 +39,6 @@ public final class ConflictMapSwitchToClause extends ConflictMap {
super(cpb, level);
}
public static IConflict createConflict(PBConstr cpb, int level) {
return new ConflictMapSwitchToClause(cpb, level);
}
/**
* reduces the constraint defined by wpb until the result of the cutting
* plane is a conflict. this reduction returns either a clause if .
......
......@@ -396,10 +396,6 @@ public final class MaxWatchPbLong extends WatchPbLong {
}
public int getAssertionLevel(IVecInt trail, int decisionLevel) {
WatchPbLongPbConstrDecorator decorator = new WatchPbLongPbConstrDecorator(
this);
IConflict cm = ConflictMap.createConflict(decorator, decisionLevel,
false);
Set<Integer> litsSet = new HashSet<Integer>();
for (Integer i : this.lits)
litsSet.add(i);
......
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