Merge branch 'main' of https://github.com/manleviet/ChocoKB

Author: manleviet

.idea/copyright/manleviet.xml

@@ -6,6 +6,7 @@ Knowledge bases:
 
 1. [PC](https://www.itu.dk/research/cla/externals/clib/)
 2. [Renault](https://www.itu.dk/research/cla/externals/clib/)
+3. [Feature Models](http://www.splot-research.org)
 
 ## How to use
 

.idea/copyright/profiles_settings.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>

README.md

@@ -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;
+        */
     }
 }

pom.xml

@@ -18,7 +18,6 @@
 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

src/main/java/at/tugraz/ist/ase/common/ConstraintUtils.java

@@ -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 {