Optimize skipped bounds value

tudo-aqua · Nov 27, 2020 · 5208178 · 5208178
1 parent 2eaf27d
commit 5208178
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/lib/jconstraints-0.9.7-SNAPSHOT.jar b/lib/jconstraints-0.9.7-SNAPSHOT.jar
diff --git 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
@@ -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;
 		}