v1.3.1: refactor API and perf

Author: cordisvictor

README.md

@@ -4,7 +4,7 @@ EasyCSP is an open-source Java library for Constraint Satisfaction Programming.
 
 EasyCSP offers search algorithms for both CSPs and CSOPs.
 
-EasyCSP supports CSPs to be formalized using objects or int expressions.
+EasyCSP supports CSPs to be defined using objects or int expressions.
 
 
 ### Dependencies
@@ -13,11 +13,16 @@ EasyCSP supports CSPs to be formalized using objects or int expressions.
 
 ### Release Notes
 
-!Release 1.2.1
+Release 1.3.1
+- refactored: Solution API and generics in general.
+- performance: avoid int-Integer autoboxing for int CSPs.
+- fix: int expression binarization issue.
+
+Release 1.2.1
 - fix: ConflictMinimizing search algorithm bug.
 - feature: added full support (algorithms and API) for int specific CSPs and CSOPs.
 
-!Release 1.2.0
+Release 1.2.0
 - fix: IntDomain size() bug when containing both positive and negative ints.
 - feature: added int specific model classes, constraint expressions API and
 specialized search algorithm.

easycsp/src-samples/KnightTour.png renamed to easycsp/resources/KnightTour.png

@@ -19,7 +19,6 @@
 package net.sourceforge.easycsp.sample.jobscheduling;
 
 import net.sourceforge.easycsp.*;
-import net.sourceforge.easycsp.Algorithm.Fitness;
 import net.sourceforge.easycsp.alg.BranchAndBound;
 
 import static net.sourceforge.easycsp.Constraints.notEqual;
@@ -34,19 +33,19 @@ public class FlowtimeMain {
     public static void main(String[] args) {
         // create CSP(Z,D,C):
         EasyCSP flowtime = EasyCSPBuilder.of("Flowtime",
-                new ObjectDomain<>(
-                        new Job(0, 3),
-                        new Job(1, 6),
-                        new Job(2, 5),
-                        new Job(3, 10),
-                        new Job(4, 9)),
-                new Machine[]{
-                        new Machine(0, 3),
-                        new Machine(1, 12),
-                        new Machine(2, 8),
-                        new Machine(3, 6),
-                        new Machine(4, 7)
-                })
+                        new ObjectDomain<>(
+                                new Job(0, 3),
+                                new Job(1, 6),
+                                new Job(2, 5),
+                                new Job(3, 10),
+                                new Job(4, 9)),
+                        new Machine[]{
+                                new Machine(0, 3),
+                                new Machine(1, 12),
+                                new Machine(2, 8),
+                                new Machine(3, 6),
+                                new Machine(4, 7)
+                        })
                 .constrainEachTwo(notEqual())
                 .build();
 
@@ -59,7 +58,7 @@ public static void main(String[] args) {
         System.out.println(solver.getSolutionCount() + " optimal solution(s) in " + solver.getElapsedTime() / 1000.00 + " seconds");
     }
 
-    private static double estimate(Solution<Machine, Job> s, int idx, double score) {
+    private static double estimate(ObjectSolution<Machine, Job> s, int idx, double score) {
         if (idx == 0) {
             double totalEstim = s.value(0).getOperationCount() / s.variable(0).get().getExecutionSpeed();
             for (int i = 1; i < s.size(); i++) {
@@ -77,7 +76,7 @@ private static double estimate(Solution<Machine, Job> s, int idx, double score)
         }
     }
 
-    private static double evaluate(Solution<Machine, Job> s, int idx, double score) {
+    private static double evaluate(ObjectSolution<Machine, Job> s, int idx, double score) {
         Variable<Machine, Job> v = s.variable(idx);
         // undo last estimation:
         double time = score - (v.getDomain().get(0).getOperationCount() / v.get().getExecutionSpeed());

easycsp/src-samples/Semaphore.png renamed to easycsp/resources/Semaphore.png

@@ -24,31 +24,31 @@ public class Job {
     private int operationCount;
 
 
-    public Job(int id, int operationcount){
-        this.id            = id;
-        this.operationCount= operationcount;
+    public Job(int id, int operationcount) {
+        this.id = id;
+        this.operationCount = operationcount;
     }
 
-    public int getId(){
+    public int getId() {
         return this.id;
     }
 
-    public int getOperationCount(){
+    public int getOperationCount() {
         return this.operationCount;
     }
 
     @Override
-    public boolean equals(Object o){
-        if( o instanceof Job){
-            Job j=(Job) o;
+    public boolean equals(Object o) {
+        if (o instanceof Job) {
+            Job j = (Job) o;
             return this.id == j.id;
         }
         return false;
     }
 
     @Override
-    public String toString(){
+    public String toString() {
         return "J(" + this.id + "," + this.operationCount + ")";
     }
 
-}//class Job.
+}

easycsp/src-samples/Sudoku.png renamed to easycsp/resources/Sudoku.png

@@ -20,35 +20,35 @@
 
 public class Machine {
 
-    private int    id;
+    private int id;
     private double executionSpeed;
 
 
-    public Machine(int id, double executionspeed){
-        this.id            = id;
-        this.executionSpeed= executionspeed;
+    public Machine(int id, double executionspeed) {
+        this.id = id;
+        this.executionSpeed = executionspeed;
     }
 
-    public int getId(){
+    public int getId() {
         return this.id;
     }
 
-    public double getExecutionSpeed(){
+    public double getExecutionSpeed() {
         return this.executionSpeed;
     }
 
     @Override
-    public boolean equals(Object o){
-        if( o instanceof Machine){
-            Machine m=(Machine) o;
+    public boolean equals(Object o) {
+        if (o instanceof Machine) {
+            Machine m = (Machine) o;
             return this.id == m.id;
         }
         return false;
     }
 
     @Override
-    public String toString(){
+    public String toString() {
         return this.id + " " + this.executionSpeed;
     }
 
-}//class Machine.
+}

easycsp/src-samples/net/sourceforge/easycsp/sample/jobscheduling/FlowtimeMain.java

@@ -33,18 +33,18 @@ public class MakespanMain {
     public static void main(String[] args) {
         // create CSP(Z,D,C):
         EasyCSP makespan = EasyCSPBuilder.of("Makespan",
-                new ObjectDomain<>(
-                        new Job(0, 3),
-                        new Job(1, 6),
-                        new Job(2, 5),
-                        new Job(3, 10),
-                        new Job(4, 9)),
-                new Machine[]{
-                        new Machine(0, 3),
-                        new Machine(1, 12),
-                        new Machine(2, 8),
-                        new Machine(3, 6),
-                        new Machine(4, 7)})
+                        new ObjectDomain<>(
+                                new Job(0, 3),
+                                new Job(1, 6),
+                                new Job(2, 5),
+                                new Job(3, 10),
+                                new Job(4, 9)),
+                        new Machine[]{
+                                new Machine(0, 3),
+                                new Machine(1, 12),
+                                new Machine(2, 8),
+                                new Machine(3, 6),
+                                new Machine(4, 7)})
                 .constrainEachTwo(notEqual())
                 .build();
 
@@ -57,7 +57,7 @@ public static void main(String[] args) {
         System.out.println(solver.getSolutionCount() + " optimal solution(s) in " + solver.getElapsedTime() / 1000.00 + " seconds");
     }
 
-    private static double estimate(Solution<Machine, Job> s, int idx, double score) {
+    private static double estimate(ObjectSolution<Machine, Job> s, int idx, double score) {
         double ret;
         if (idx == 0) {
             ret = s.value(0).getOperationCount() / s.variable(0).get().getExecutionSpeed();
@@ -78,7 +78,7 @@ private static double estimate(Solution<Machine, Job> s, int idx, double score)
         return ret > max ? ret : max;
     }
 
-    private static double evaluate(Solution<Machine, Job> s, int idx, double score) {
+    private static double evaluate(ObjectSolution<Machine, Job> s, int idx, double score) {
         double max = Double.NEGATIVE_INFINITY;
         for (int i = 0; i < s.size(); i++) {
             double crtValue = s.value(i).getOperationCount() / s.variable(i).get().getExecutionSpeed();

easycsp/src-samples/net/sourceforge/easycsp/sample/jobscheduling/Job.java

@@ -24,20 +24,20 @@ public class Cell {
     public final int y;
 
 
-    public Cell(){
-        this.x= -1;
-        this.y= -1;
+    public Cell() {
+        this.x = -1;
+        this.y = -1;
     }
 
-    public Cell(int x, int y){
-        this.x= x;
-        this.y= y;
+    public Cell(int x, int y) {
+        this.x = x;
+        this.y = y;
     }
 
     @Override
     public boolean equals(Object o) {
-        if( o instanceof Cell){
-            Cell c=(Cell) o;
+        if (o instanceof Cell) {
+            Cell c = (Cell) o;
             return this.x == c.x && this.y == c.y;
         }
         return false;
@@ -56,4 +56,4 @@ public String toString() {
         return "[" + this.x + "," + this.y + "]";
     }
 
-}//class Cell.
+}

easycsp/src-samples/net/sourceforge/easycsp/sample/jobscheduling/Machine.java

@@ -18,8 +18,8 @@
  */
 package net.sourceforge.easycsp.sample.knighttour;
 
-import net.sourceforge.easycsp.*;
 import net.sourceforge.easycsp.Algorithm.Fitness;
+import net.sourceforge.easycsp.*;
 import net.sourceforge.easycsp.alg.Greedy;
 
 import static net.sourceforge.easycsp.Constraints.is;
@@ -57,8 +57,8 @@ public static void main(String[] args) {
         System.out.println(s.getSolutionCount() + " solution in " + s.getElapsedTime() / 1000.00 + " seconds");
     }
 
-    private static Fitness<?, Cell> minDegree() {
-        return new Fitness<Object, Cell>() {
+    private static Fitness<ObjectSolution<Object, Cell>> minDegree() {
+        return new Fitness<>() {
             private final boolean[][] used = new boolean[BOARD_SIZE][BOARD_SIZE];
 
             private boolean isValid(int x, int y) {
@@ -72,7 +72,7 @@ private boolean isValid(int x, int y) {
             }
 
             @Override
-            public double compute(Solution<Object, Cell> sol, int variableIndex, double score) {
+            public double compute(ObjectSolution<Object, Cell> sol, int variableIndex, double score) {
                 if (variableIndex > 0) {
                     Cell prev = sol.value(variableIndex - 1);
                     this.used[prev.x][prev.y] = true;