Merge pull request #19 from manleviet/second_version

Second version

Author: manleviet

.idea/copyright/manleviet.xml

@@ -22,6 +22,12 @@
             <artifactId>fm</artifactId>
             <version>1.2</version>
         </dependency>
+
+        <dependency>
+            <groupId>at.tugraz.ist.ase</groupId>
+            <artifactId>eval-package</artifactId>
+            <version>1.2</version>
+        </dependency>
     </dependencies>
 
     <distributionManagement>

.idea/copyright/profiles_settings.xml

@@ -11,19 +11,32 @@
 import at.tugraz.ist.ase.knowledgebases.core.Constraint;
 import lombok.NonNull;
 import lombok.experimental.UtilityClass;
+import lombok.extern.slf4j.Slf4j;
+import org.chocosolver.solver.Model;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import static at.tugraz.ist.ase.eval.evaluator.PerformanceEvaluator.incrementCounter;
+
 @UtilityClass
+@Slf4j
 public final class ConstraintUtils {
 
+    // for evaluation
+    public final String COUNTER_UNPOST_CONSTRAINT = "The number of unpost constraints:";
+    public final String COUNTER_POST_CONSTRAINT = "The number of post constraints:";
+    public final String COUNTER_CONSTAINS_CONSTRAINT = "The number of contains calls:";
+
     public String convertToString(@NonNull Set<Constraint> ac) {
         return ac.stream().map(Constraint::toString).collect(Collectors.joining("\n"));
     }
 
     public String convertToStringWithMessage(@NonNull List<Set<Constraint>> allDiag, @NonNull String mess) {
+        if (allDiag.isEmpty()) return "";
+
         StringBuilder sb = new StringBuilder();
         int count = 0;
         for (Set<Constraint> diag : allDiag) {
@@ -39,11 +52,29 @@ public String convertToStringWithMessage(@NonNull List<Set<Constraint>> allDiag,
         return sb.toString();
     }
 
+    public void postConstraints(Collection<Constraint> C, Model toModel) {
+        for (Constraint c : C) {
+            c.getChocoConstraints().forEach(toModel::post);
+            incrementCounter(COUNTER_POST_CONSTRAINT, c.getChocoConstraints().size());
+        }
+        log.trace("{}Posted constraints", LoggerUtils.tab);
+    }
+
     public boolean isMinimal(Set<Constraint> diag, List<Set<Constraint>> allDiag) {
-        return allDiag.stream().noneMatch(diag::containsAll);
+        return allDiag.parallelStream().noneMatch(diag::containsAll);
     }
 
     public boolean containsAll(List<Set<Constraint>> allDiag, Set<Constraint> diag) {
-        return allDiag.stream().anyMatch(adiag -> adiag.containsAll(diag));
+        return allDiag.parallelStream().anyMatch(adiag -> adiag.containsAll(diag));
+    }
+
+    public boolean hasIntersection(Collection<Constraint> col1, Collection<Constraint> col2) {
+        return col1.parallelStream().anyMatch(col2::contains);
+        /*
+        for (Constraint c : col1) {
+            if (col2.contains(c)) return true;
+        }
+        return false;
+        */
     }
 }

.idea/misc.xml

@@ -18,6 +18,9 @@
 import java.util.List;
 import java.util.Objects;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkElementIndex;
+
 @Getter
 @Slf4j
 public class Constraint {
@@ -33,9 +36,13 @@ public Constraint(@NonNull String constraint) {
         log.trace("{}Created Constraint [cstr={}]", LoggerUtils.tab, constraint);
     }
 
-    public void addChocoConstraints(Model model, int startIdx, int endIdx, boolean hasNegativeConstraints) {
+    public void addChocoConstraints(@NonNull Model model, int startIdx, int endIdx, boolean hasNegativeConstraints) {
         org.chocosolver.solver.constraints.Constraint[] constraints = model.getCstrs();
 
+        checkElementIndex(startIdx, constraints.length, "startIdx must be within the range of constraints");
+        checkElementIndex(endIdx, constraints.length, "endIdx must be within the range of constraints");
+        checkArgument(startIdx <= endIdx, "startIdx must be <= endIdx");
+
         if (hasNegativeConstraints) {
             endIdx = endIdx - 2;
         } else {

.idea/runConfigurations.xml

@@ -18,7 +18,7 @@
 import java.util.List;
 import java.util.stream.IntStream;
 
-import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkElementIndex;
 
 @Getter
 @ToString
@@ -75,7 +75,7 @@ public int getNumVariables() {
     }
 
     public Variable getVariable(int index) {
-        checkArgument(index >= 0 && index < variableList.size(), "Index out of bounds");
+        checkElementIndex(index, variableList.size(), "Index out of bounds");
 
         return variableList.get(index);
     }
@@ -116,7 +116,7 @@ public int getNumConstraints() {
     }
 
     public Constraint getConstraint(int index) {
-        checkArgument(index >= 0 && index < constraintList.size(), "Index out of bounds");
+        checkElementIndex(index, constraintList.size(), "Index out of bounds");
 
         return constraintList.get(index);
     }

pom.xml

@@ -20,9 +20,6 @@
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.stream.IntStream;
-
-import static com.google.common.base.Preconditions.checkArgument;
 
 @Slf4j
 public class PCKB extends KB {