Commit b42710a4 authored by Daniel Le Berre's avatar Daniel Le Berre

Merge branch 'master' of https://gitlab.ow2.org/sat4j/sat4j.git

parents be0b98ef 3dd457b2
Pipeline #7536 passed with stages
in 215 minutes and 10 seconds
......@@ -121,7 +121,7 @@ public class ModelIterator extends SolverDecorator<ISolver> {
@Override
public int[] model() {
int[] last = super.model();
this.nbModelFound++;
this.nbModelFound += 1 << (nVars() - last.length);
try {
blockingClauses.add(discardCurrentModel());
} catch (ContradictionException e) {
......
......@@ -118,12 +118,13 @@ public abstract class AbstractApproxMCTest {
*/
@Parameters
public static Collection<Object[]> benchmarks() {
return Arrays.asList(
new Object[][] { { "jnh/jnh12.cnf", BigInteger.valueOf(80) },
{ "jnh/jnh17.cnf", BigInteger.valueOf(513) },
{ "jnh/jnh213.cnf", BigInteger.valueOf(4264) },
{ "jnh/jnh1.cnf", BigInteger.valueOf(11711) },
{ "jnh/jnh218.cnf", BigInteger.valueOf(14082) } });
return Arrays.asList(new Object[][] {
{ "blockmap_05_01.net.cnf", BigInteger.valueOf(640) },
{ "jnh/jnh12.cnf", BigInteger.valueOf(80) },
{ "jnh/jnh17.cnf", BigInteger.valueOf(513) },
{ "jnh/jnh213.cnf", BigInteger.valueOf(4264) },
{ "jnh/jnh1.cnf", BigInteger.valueOf(11711) },
{ "jnh/jnh218.cnf", BigInteger.valueOf(14082) } });
}
/**
......
This diff is collapsed.
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