Changes made in preparation for the XCSP3 and MiniZinc competitions

.github/workflows/maven-test.yml

@@ -7,7 +7,7 @@ on: [push, pull_request]
 
 jobs:
   test-ibex:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     # The different steps
     steps:
       - uses: actions/checkout@v4
@@ -27,7 +27,9 @@ jobs:
 
       # Regression tests
       - name: Test Ibex
-        run: mvn --file pom.xml test -Pcoverage -DtestFailureIgnore=true -Dgroups=ibex
+        run: |
+          export LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib/ibex/3rd
+          mvn --file pom.xml test -Pcoverage -DtestFailureIgnore=true -Dgroups=ibex
 
   test-solver:
     runs-on: ubuntu-latest

CHANGES.md

@@ -14,13 +14,19 @@ NEXT MILESTONE
 ### Other closed issues and pull requests:
 See [milestone 5.0.0-beta.2](https://github.com/chocoteam/choco-solver/milestone/41)
 
+- Performance improvement in PropXPlusYEqZ and PropAbsolute
 - Fix bug in ConflictOrderingSearch (monitor not plugged)
 - Performance improvement for LastConflict, ConflictOrderingSearch and StrategySequencer.
 - Fix bug : regular constraints parsed from XCSP now support negative values
+- Fix bug : Unexpected behavior when using Task with scalar (#1114)
+- Replace Cumulative implementation by state-of-the-art implementation of TimeTabling and OverloadChecking
+- Fix bug : IntVar no longer extends Iterable to avoid errors in nested loops
+- Fix bug : Fix iterator issue when using ISet, especially within graph variables (#1174 and #1175)
 
 #### Contributors to this release:
 - [Charles Prud'homme](https://github.com/cprudhom) (@cprudhom)
 - [Jean-Guillaume Fages](https://github.com/jgFages) (@jgFages)
+- [Arthur Godet](https://github.com/ArthurGodet) (@ArthurGodet)
 
 
 **Full Changelog**: https://github.com/chocoteam/choco-solver/compare/v5.0.0-beta.1...v5.0.0-beta.2
@@ -70,23 +76,6 @@ See [milestone 5.0.0](https://github.com/chocoteam/choco-solver/milestone/40)
 
 **Full Changelog**: https://github.com/chocoteam/choco-solver/compare/v4.10.17...v4.10.18
 
-4.10.17 - 23 Sep 2024
- -------------------
-
- ### Hotfix
- - Fix bug in `PropHybridTable` (#1102)
-
- **Full Changelog**: https://github.com/chocoteam/choco-solver/compare/v4.10.16...v4.10.17
-
-4.10.16 - 12 Sep 2024
--------------------
-
-### Hotfix
-- Fix bug in `IntAffineView` (#1101)
-
-**Full Changelog**: https://github.com/chocoteam/choco-solver/compare/v4.10.15...v4.10.16
-
-
 4.10.17 - 23 Sep 2024
 -------------------
 

Makefile

@@ -2,7 +2,7 @@
 # like running test suites
 
 ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
-PRETTY_DATE := $(shell date +'%m/%d/%Y %H:%M')
+PRETTY_DATE := $(shell date +'%Y-%m-%dT%H:%M')
 DATE := $(shell date +'%y%m%d_%H%M')
 CURRENT_VERSION := $(shell mvn help:evaluate -Dexpression=project.version | grep -v "\[INFO\]" | grep -v "\[WARNING\]")
 
@@ -53,8 +53,8 @@ tests : 1s 10s ibex checker mzn xcsp mps dimacs expl lcg
 	mvn test -DtestFailureIgnore=true -Dgroups="$@"
 
 update_date:
-	@sed -i '' 's|\s*System.out.printf("c Choco.*|System.out.printf("c Choco%s ($(PRETTY_DATE))\\n", lcg? " with LCG" : "");|' parsers/src/main/java/org/chocosolver/parser/xcsp/XCSP.java
-	@sed -i '' 's|\s*System.out.printf("%% Choco%s (.*|System.out.printf("%% Choco%s ($(PRETTY_DATE))\\n", lcg? " with LCG" : "");|' parsers/src/main/java/org/chocosolver/parser/flatzinc/Flatzinc.java
+	@sed -i '' 's|\s*System.out.printf("c Choco.*|System.out.printf("c Choco-solver%s ($(CURRENT_VERSION), $(PRETTY_DATE))\\n", lcg? " with LCG" : "");|' parsers/src/main/java/org/chocosolver/parser/xcsp/XCSP.java
+	@sed -i '' 's|\s*System.out.printf("%% Choco.*|System.out.printf("%% Choco-solver%s ($(CURRENT_VERSION), $(PRETTY_DATE))\\n", lcg? " with LCG" : "");|' parsers/src/main/java/org/chocosolver/parser/flatzinc/Flatzinc.java
 
 compet: update_date clean package
 
@@ -70,6 +70,11 @@ delmsc:
 	@rm ~/.minizinc/solvers/choco-$(VERSION).msc
 
 docker: compet
+	# add an image with LCG support
+	@sed -i '' 's|python3.*|python3 "$$(dirname "$$0")/fzn-choco.py" "$$@" "-lcg"|' parsers/src/main/minizinc/fzn-choco.sh
+	@docker build -f $(ROOT_DIR)/parsers/src/main/minizinc/docker/Dockerfile.dms -t chocoteam/choco-solver-mzn:$(CURRENT_VERSION)-X $(ROOT_DIR)
+	# add an image without LCG support
+	@sed -i '' 's|python3.*|python3 "$$(dirname "$$0")/fzn-choco.py" "$$@"|' parsers/src/main/minizinc/fzn-choco.sh
 	@docker build -f $(ROOT_DIR)/parsers/src/main/minizinc/docker/Dockerfile.dms -t chocoteam/choco-solver-mzn:$(CURRENT_VERSION) $(ROOT_DIR)
 
 antlr:

examples/src/test/java/org/chocosolver/examples/integer/CostasArraysTest.java

@@ -36,7 +36,7 @@ public void test(){
 		CostasArrays ca = new CostasArrays();
 		ca.execute();
 		Assert.assertEquals(ca.getModel().getSolver().getSolutionCount(), 1);
-		Assert.assertEquals(ca.getModel().getSolver().getNodeCount(), 6539);
+		Assert.assertEquals(ca.getModel().getSolver().getNodeCount(), 8_987);
 	}
 
 	@Test(groups = "10s", timeOut = 60000)

examples/src/test/java/org/chocosolver/examples/integer/KnapsackTest.java

@@ -131,7 +131,7 @@ public void testOPT13() throws IOException, SetUpException {
         ks.solveIt(s, true);
         Assert.assertEquals(s.getSolver().getBestSolutionValue().intValue(), 2657, "obj val");
         Assert.assertEquals(s.getSolver().getSolutionCount(), 3, "nb sol");
-        Assert.assertEquals(s.getSolver().getNodeCount(), 60, "nb nod");
+        Assert.assertEquals(s.getSolver().getNodeCount(), 59, "nb nod");
     }
 
     @Test(groups = "1s", timeOut = 60000)

parsers/pom.xml

@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.xcsp</groupId>
             <artifactId>xcsp3-tools</artifactId>
-            <version>2.4</version>
+            <version>2.5</version>
         </dependency>
         <dependency>
             <groupId>org.antlr</groupId>
@@ -114,11 +114,41 @@
                                         <exclude>org/apache/fontbox/**</exclude>
                                     </excludes>
                                 </filter>
+                                <filter>
+                                    <artifact>junit:junit</artifact>
+                                    <excludes>
+                                        <exclude>**</exclude>
+                                    </excludes>
+                                </filter>
                             </filters>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.3.1</version>
+                <executions>
+                    <execution>
+                        <id>copy-licenses</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.outputDirectory}/META-INF</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>../target/classes/META-INF</directory>
+                                    <includes>
+                                        <include>THIRD-PARTY-LICENSES.txt</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>3.4.2</version>

parsers/src/main/java/org/chocosolver/parser/RegParser.java

@@ -95,8 +95,8 @@ public abstract class RegParser implements IParser {
 
     @Option(name = "-flush",
             forbids = {"-varsel"},
-            usage = "Autoflush weights on black-box strategies (default: 32).")
-    protected int flushRate = 32;
+            usage = "Autoflush weights on black-box strategies (default: 20).")
+    protected int flushRate = 20;
 
     @Option(name = "-varsel",
             handler = VarSelHandler.class,
@@ -166,7 +166,7 @@ public abstract class RegParser implements IParser {
     protected int nb_cores = 1;
 
     @Option(name = "-seed", usage = "Set the seed for random number generator. ")
-    protected long seed = 0L;
+    protected long seed = 1_000_000_007L;
 
     @Option(name = "--cp-profiler", usage = "Connect to CP-Profiler. Two comma-separated values are expected: the execution id and the port.")
     public String cpProfiler = null;

parsers/src/main/java/org/chocosolver/parser/flatzinc/Flatzinc.java

@@ -71,8 +71,8 @@ public enum CompleteSearch{
     protected boolean oss = false;
 
     @Option(name = "-ocs", usage = "Opens the complementary search to all variables of the problem\n" +
-            "(default: OUTPUT, i.e., restricted to the variables declared in output).")
-    protected CompleteSearch ocs = CompleteSearch.OUTPUT;
+            "(default: ALL, i.e., complete the search with a search on all variables.).")
+    protected CompleteSearch ocs = CompleteSearch.ALL;
 
     //***********************************************************************************
     // VARIABLES

parsers/src/main/java/org/chocosolver/parser/flatzinc/ast/FConstraint.java

@@ -22,6 +22,7 @@
 import org.chocosolver.solver.expression.discrete.logical.NaLoExpression;
 import org.chocosolver.solver.variables.*;
 import org.chocosolver.util.objects.setDataStructures.iterable.IntIterableRangeSet;
+import org.chocosolver.util.tools.ArrayUtils;
 import org.chocosolver.util.tools.VariableUtils;
 
 import java.util.ArrayList;
@@ -752,25 +753,7 @@ public void build(Model model, Datas datas, String id, List<Expression> exps, Li
 
             IntVar[] vars = exps.get(0).toIntVarArray(model);
             if (vars.length > 1) {
-                if(model.getSettings().isLCG()){
-                    if (model.getSettings().warnUser()) {
-                        model.getSolver().log().white().println(
-                                "Warning: fzn_alldifferent_except_0 constraint is decomposed (due to LCG).");
-                    }
-                    IntIterableRangeSet values = new IntIterableRangeSet();
-                    for(int i = 0; i < vars.length; i++){
-                        values.addAll(vars[i]);
-                    }
-                    values.add(0);
-                    int[] valuesArray = values.toArray();
-                    IntVar[] occurrences = new IntVar[valuesArray.length];
-                    for(int i = 0; i < valuesArray.length; i++){
-                        occurrences[i] = model.intVar(0, valuesArray[i] == 0?vars.length:1);
-                    }
-                    model.globalCardinality(vars, valuesArray, occurrences, true).post();
-                }else {
-                    model.allDifferentExcept0(vars).post();
-                }
+                model.allDifferentExcept0(vars).post();
             }
 
         }
@@ -1079,21 +1062,11 @@ public void build(Model model, Datas datas, String id, List<Expression> exps, Li
             final IntVar[] resources = exps.get(2).toIntVarArray(model);
             final IntVar limit = exps.get(3).intVarValue(model);
             String decomp = (String) model.getHook("CUMULATIVE");
+            if (decomp == null) {
+                decomp = "GLB"; // TODO: make it configurable
+            }
             int n = starts.length;
             switch (decomp) {
-                case "GLB":
-                    final IntVar[] ends = new IntVar[n];
-                    Task[] tasks = new Task[n];
-                    for (int i = 0; i < n; i++) {
-                        ends[i] = model.intVar(starts[i].getName() + "_" + durations[i].getName(),
-                                starts[i].getLB() + durations[i].getLB(),
-                                starts[i].getUB() + durations[i].getUB(),
-                                true);
-                        assert durations[i].getUB() >= 0 && resources[i].getUB() >= 0;
-                        tasks[i] = new Task(starts[i], durations[i], ends[i]);
-                    }
-                    model.cumulative(tasks, resources, limit, true/*, Cumulative.Filter.NAIVETIME*/).post();
-                    break;
                 case "MZN":
                     model.cumulativeTimeDec(starts,
                             Arrays.stream(durations).mapToInt(IntVar::getUB).toArray(),
@@ -1178,6 +1151,20 @@ public void build(Model model, Datas datas, String id, List<Expression> exps, Li
                                 -resources[i].getValue() + limit.getValue()).post();
                     }
                     break;
+                case "GLB":
+                default:
+                    final IntVar[] ends = new IntVar[n];
+                    Task[] tasks = new Task[n];
+                    for (int i = 0; i < n; i++) {
+                        ends[i] = model.intVar(starts[i].getName() + "_" + durations[i].getName(),
+                                starts[i].getLB() + durations[i].getLB(),
+                                starts[i].getUB() + durations[i].getUB(),
+                                true);
+                        assert durations[i].getUB() >= 0 && resources[i].getUB() >= 0;
+                        tasks[i] = new Task(starts[i], durations[i], ends[i]);
+                    }
+                    model.cumulative(tasks, resources, limit/*, Cumulative.Filter.NAIVETIME*/).post();
+                    break;
             }
         }
     },
@@ -1716,6 +1703,9 @@ public void build(Model model, Datas datas, String id, List<Expression> exps, Li
             for (int[] couple : t) {
                 tuples.add(couple);
             }
+            if(x.length == 1) {
+                model.member(x[0], ArrayUtils.flatten(tuples.toMatrix())).post();
+            } else
             if (x.length == 2) {
                 model.table(x[0], x[1], tuples).post();
             } else {

parsers/src/main/java/org/chocosolver/parser/flatzinc/ast/FVariable.java

@@ -249,10 +249,24 @@ private static IntVar buildOnExpression(String name, Expression expression, Data
     private static SetVar buildWithSet(String name, DSet type, Expression expression, Datas datas, Model model) {
         Declaration what = type.getWhat();
         SetVar sv = null;
-        if(expression != null){
-            Exit.log("Unknown expression");
+        int[] ub = null;
+        if(expression != null) {
+            switch (expression.getTypeOf()) {
+                case SET_B:
+                    DInt2 bounds = (DInt2) what;
+                    ub = new int[bounds.getUpp() - bounds.getLow() + 1];
+                    for (int i = 0; i < ub.length; i++) {
+                        ub[i] = i + bounds.getLow();
+                    }
+                    break;
+                case SET_L:
+                    DManyInt mint = (DManyInt) what;
+                    ub = mint.getValues();
+                    break;
+                default:
+                    Exit.log("Unknown expression");
+            }
         }else {
-            int[] ub = null;
             switch (what.typeOf) {
                 case INT2:
                     DInt2 bounds = (DInt2) what;
@@ -269,9 +283,9 @@ private static SetVar buildWithSet(String name, DSet type, Expression expression
                     Exit.log("Unknown set type");
                     break;
             }
-            if(ub != null){
-                sv = model.setVar(DEBUG ? name : NO_NAME, new int[]{}, ub);
-            }
+        }
+        if(ub != null){
+            sv = model.setVar(DEBUG ? name : NO_NAME, new int[]{}, ub);
         }
         datas.register(name, sv);
         return sv;

parsers/src/main/java/org/chocosolver/parser/xcsp/XCSP.java

@@ -14,6 +14,8 @@
 import org.chocosolver.solver.Model;
 import org.chocosolver.solver.ResolutionPolicy;
 import org.chocosolver.solver.Solver;
+import org.chocosolver.solver.search.restart.InnerOuterCutoff;
+import org.chocosolver.solver.search.restart.Restarter;
 import org.chocosolver.solver.search.strategy.BlackBoxConfigurator;
 import org.chocosolver.solver.search.strategy.Search;
 import org.chocosolver.solver.search.strategy.SearchParams;
@@ -134,7 +136,17 @@ public void buildModel() {
     public void parse(Model target, XCSPParser parser) throws Exception {
         parser.model(target, instance);
         // and define a search strategy
-        freesearch(target.getSolver());
+        BlackBoxConfigurator bb = BlackBoxConfigurator.init();
+        // variable selection
+        bb.setIntVarStrategy(Search::roundRobinSearch)
+                .setRestartPolicy(s -> new Restarter(new InnerOuterCutoff(50, 1.01, 1.01),
+                        c -> s.getFailCount() >= c, 50_000, true))
+                .setNogoodOnRestart(!lcg)
+                .setRestartOnSolution(lcg)
+                .setRefinedPartialAssignmentGeneration(false)
+                .setExcludeObjective(true)
+                .setExcludeViews(false);
+        bb.make(target);
     }
 
 
@@ -264,6 +276,9 @@ private void onSolution(Solver solver, XCSPParser parser) {
             try {
                 output.insert(0, "s SATISFIABLE\n");
                 new SolutionChecker(true, instance, new ByteArrayInputStream(output.toString().getBytes()));
+//                new SolutionChecker(instance, new ByteArrayInputStream(output.toString().getBytes()),
+//                        solver.getObjectiveManager().isOptimization() ? solver.getObjectiveManager().getBestSolutionValue().longValue() : null,
+//                        null, true);
             } catch (Exception e) {
                 throw new RuntimeException("wrong solution found twice");
             }
@@ -329,6 +344,9 @@ private void finalOutPut(Solver solver) {
         if (cs) {
             try {
                 new SolutionChecker(true, instance, new ByteArrayInputStream(output.toString().getBytes()));
+//                new SolutionChecker(instance, new ByteArrayInputStream(output.toString().getBytes()),
+//                                        solver.getObjectiveManager().isOptimization() ? solver.getObjectiveManager().getBestSolutionValue().longValue() : null,
+//                                        null, true);
             } catch (Exception e) {
                 e.printStackTrace();
             }