diff --git a/lib/jconstraints-0.9.7-SNAPSHOT.jar b/lib/jconstraints-0.9.7-SNAPSHOT.jar index e09a7f4..4f4c3ea 100644 Binary files a/lib/jconstraints-0.9.7-SNAPSHOT.jar and b/lib/jconstraints-0.9.7-SNAPSHOT.jar differ diff --git a/src/main/gov/nasa/jpf/jdart/solvers/bounded/BoundedSolver.java b/src/main/gov/nasa/jpf/jdart/solvers/bounded/BoundedSolver.java index 399086a..66b087b 100644 --- a/src/main/gov/nasa/jpf/jdart/solvers/bounded/BoundedSolver.java +++ b/src/main/gov/nasa/jpf/jdart/solvers/bounded/BoundedSolver.java @@ -23,9 +23,9 @@ public class BoundedSolver extends ConstraintSolver { private final int bound; private final int fibonacci[] = { - 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987, 1597, 2584, 4181, 6765 + 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987, 1597, 2584, 4181, 6765 }; - private final int skipped[] = {2, 5, 21}; + private final int skipped[] = {2, 8, 13}; BoundType type; public BoundedSolver(ConstraintSolver back, int bound, int itr, BoundType type) { diff --git a/src/main/gov/nasa/jpf/jdart/solvers/bounded/BoundedSolverProvider.java b/src/main/gov/nasa/jpf/jdart/solvers/bounded/BoundedSolverProvider.java index 0811d40..eb69130 100644 --- a/src/main/gov/nasa/jpf/jdart/solvers/bounded/BoundedSolverProvider.java +++ b/src/main/gov/nasa/jpf/jdart/solvers/bounded/BoundedSolverProvider.java @@ -3,7 +3,6 @@ import gov.nasa.jpf.constraints.api.ConstraintSolver; import gov.nasa.jpf.constraints.solvers.ConstraintSolverFactory; import gov.nasa.jpf.constraints.solvers.ConstraintSolverProvider; - import java.util.Properties; public class BoundedSolverProvider implements ConstraintSolverProvider { @@ -31,7 +30,12 @@ public ConstraintSolver createSolver(Properties config) { if (config.containsKey("bounded.iter")) { iter = Integer.parseInt(config.getProperty("bounded.iter")); } - if (config.containsKey("bounded.type") && config.getProperty("bounded.type").equals("fibonacci")) { + if (config.containsKey("bounded.type") && config.getProperty("bounded.type") + .equals("fibonacci")) { + type = BoundedSolver.BoundType.fibonacci; + } + if (config.containsKey("bounded.type") && config.getProperty("bounded.type") + .equals("skipped")) { type = BoundedSolver.BoundType.fibonacci; }