Commit c8d4f47e authored by leberre's avatar leberre

Updated code to be in sync with core module.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@315 ba638df5-4473-46d1-82f8-c3ae2a17a6e1
parent 34244a1b
......@@ -35,7 +35,7 @@ import org.sat4j.AbstractLauncher;
import org.sat4j.Messages;
import org.sat4j.core.ASolverFactory;
import org.sat4j.core.VecInt;
import org.sat4j.minisat.constraints.MixedDataStructureDaniel;
import org.sat4j.minisat.constraints.MixedDataStructureDanielWL;
import org.sat4j.minisat.core.DataStructureFactory;
import org.sat4j.minisat.core.DotSearchListener;
import org.sat4j.minisat.core.IOrder;
......@@ -209,7 +209,7 @@ public class Lanceur extends AbstractLauncher {
if (dotfilename == null) {
dotfilename = "sat4j.dot";
}
((Solver<?, DataStructureFactory<?>>) asolver)
((Solver<DataStructureFactory>) asolver)
.setSearchListener(new DotSearchListener(dotfilename));
}
......@@ -288,7 +288,7 @@ public class Lanceur extends AbstractLauncher {
pf.setProperty(couple[0], couple[1]);
}
DataStructureFactory dsf = setupObject("DSF", pf,
new MixedDataStructureDaniel());
new MixedDataStructureDanielWL());
LearningStrategy learning = setupObject("LEARNING", pf,
new PercentLengthLearning());
IOrder order = setupObject("ORDER", pf, new VarOrderHeap());
......
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