Replace Cumulative implementation by state-of-the-art implementation of TimeTabling and OverloadChecking (#1165) and fixes #1114

Author: ArthurGodet

.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

@@ -70,23 +70,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
 -------------------
 

parsers/src/test/java/org/chocosolver/flatzinc/PerformanceTest.java

@@ -9,6 +9,7 @@
  */
 package org.chocosolver.flatzinc;
 
+import org.chocosolver.parser.Level;
 import org.chocosolver.parser.PerformanceListener;
 import org.chocosolver.parser.SetUpException;
 import org.chocosolver.parser.flatzinc.Flatzinc;
@@ -40,7 +41,7 @@ public class PerformanceTest {
     private static final String COMMENT = "#";
     private static final String DELIMITER = ",";
 
-    private static final String LEVEL = "SILENT";
+    private static final String LEVEL = Level.SILENT.name();
 
 
     public Object[][] getInstances(String name) {

parsers/src/test/resources/flatzinc/instances.csv

@@ -46,13 +46,13 @@
 2012,amaze+amaze+2012-06-22.fzn,1,928,321050,321049
 #2012,amaze+amaze+2012-07-04.fzn,1,481,244,243
 2012,fast-food+fastfood+ff3.fzn,195,1330,71699,71310
-2012,filters+filter+ar_1_2.fzn,4,18,28624,28617
+2012,filters+filter+ar_1_2.fzn,4,18,26682,26675
 2012,filters+filter+dct_1_1.fzn,1,34,49,48
 2012,filters+filter+ewf_1_1.fzn,1,28,37,36
 2012,filters+filter+fir16_1_1.fzn,1,35,34,33
 2012,filters+filter+fir_1_1.fzn,1,18,24,23
-2012,mspsp+mspsp+easy_01.fzn,5,26,1251640,1251631
-2012,mspsp+mspsp+medium_03.fzn,5,26,1251640,1251631
+2012,mspsp+mspsp+easy_01.fzn,5,26,1251641,1251632
+2012,mspsp+mspsp+medium_03.fzn,5,26,1251641,1251632
 2012,nonogram+non+non_fast_8.fzn,1,_,1932,1928
 2012,pattern-set-mining-k2+pattern_set_mining_k2+audiology.fzn,38,54,212187,212112
 2012,radiation+radiation+m06_15_15.fzn,1,711,307742,307741

parsers/src/test/resources/xcsp/instances.csv

@@ -20,9 +20,9 @@ basics;Cutstock-small.xml.lzma;2;4;21;18
 basics;Domino-300-300.xml.lzma;1;_;1;0
 basics;driverlogw-09.xml.lzma;1;_;1758;1211
 basics;Fapp-m2s-ex2_c18.xml.lzma;16;13871;282;180
-basics;Filters-dct_2_3.xml.lzma;19;16;3052;1704
-basics;FlexibleJobshop-easy01.xml.lzma;24;253;213;152
-basics;FlexibleJobshop-easy02.xml.lzma;64;11;6921;3059
+basics;Filters-dct_2_3.xml.lzma;19;16;2051;1100
+basics;FlexibleJobshop-easy01.xml.lzma;31;253;262;171
+basics;FlexibleJobshop-easy02.xml.lzma;59;11;5770;2403
 basics;Furniture.xml.lzma;1;603;33;32
 basics;GracefulGraph-K02-P04.xml.lzma;1;_;85;73
 basics;GraphColoring-3-fullins-4.xml.lzma;11;6;101587;76903
@@ -44,8 +44,8 @@ basics;MagicSquare-6-sum.xml.lzma;1;_;217;162
 basics;Mapping-full2x2_mp3.xml.lzma;1;1100;1345;1203
 basics;Mario-easy-4.xml.lzma;16;545;8705;8077
 #basics;MarketSplit-01.xml.lzma;0;_;1113575;919484
-basics;MSPSP-easy_01.xml.lzma;13;26;1421;650
-basics;MSPSP-hard_01.xml.lzma;4;35;305;229
+basics;MSPSP-easy_01.xml.lzma;14;26;1816;800
+basics;MSPSP-hard_01.xml.lzma;4;35;627;512
 basics;MultiKnapsack-1-0_X2.xml.lzma;1;_;2;0
 basics;MultiKnapsack-1-01.xml.lzma;1;_;2;0
 basics;NFC-12_2_10.xml.lzma;31;848;173;108
@@ -71,7 +71,7 @@ basics;QueenAttacking-06.xml.lzma;5;0;4307;3458
 basics;Queens-0008-m1.xml.lzma;1;_;31;27
 basics;RadarSurveillance-8-24-3-2-00.xml.lzma;1;_;92;22
 basics;Ramsey-12.xml.lzma;45;2;71913;41237
-basics;Rcpsp-j30-01-01_c18.xml.lzma;7;43;208;179
+basics;Rcpsp-j30-01-01_c18.xml.lzma;7;43;204;175
 basics;Rlfap-graph-04-opt_c18.xml.lzma;5;394;1492;801
 basics;RoomMate-sr0050-int.xml.lzma;1;_;2;0
 basics;SocialGolfers-4-3-4-cp.xml.lzma;1;_;225;151
@@ -82,11 +82,11 @@ basics;SteelMillSlab-m2-simple_c18.xml.lzma;1;0;70;50
 basics;SteelMillSlab-m2s-mini-simple_c18.xml.lzma;1;0;138;50
 basics;StillLife-03-06.xml.lzma;5;10;424;381
 basics;StillLife-wastage-03.xml.lzma;3;6;23;18
-basics;StripPacking-C1P1.xml.lzma;1;_;109846;80898
+basics;StripPacking-C1P1.xml.lzma;1;_;23702;17004
 basics;Subisomorphism-A-10.xml.lzma;1;_;30;28
 basics;Sudoku-s01a-alldiff.xml.lzma;1;_;1;0
 basics;SumColoring-myciel4_c18.xml.lzma;4;22;45690;42079
-basics;Taillard-os-04-04-0.xml.lzma;28;193;8848;7869
+basics;Taillard-os-04-04-0.xml.lzma;52;193;13313;11765
 basics;Tal-01_c18.xml.lzma;2;6;11;8
 basics;TeamAssignment-data1_4_6.xml.lzma;20;2948;11657;10545
 basics;TemplateDesign-m1-1_c18.xml.lzma;2;2;133;129

scripts/Ibex.dms

@@ -0,0 +1,26 @@
+FROM ubuntu:latest
+
+# install Java 21
+RUN apt-get update && \
+    apt-get install -y sudo openjdk-21-jdk-headless default-jdk python3 vim git maven curl g++ gcc flex bison cmake git pkg-config
+
+RUN curl https://codeload.github.com/ibex-team/ibex-lib/tar.gz/ibex-2.9.1 > ibex-2.9.1.tar.gz && \
+  tar -xzf ibex-2.9.1.tar.gz && \
+  cd ibex-lib-ibex-2.9.1 && \
+# RUN #git clone https://github.com/ibex-team/ibex-lib.git && \
+#    cd ibex-lib && \
+    mkdir build && \
+    cd build && \
+    cmake -DLP_LIB=soplex -DBUILD_JAVA_INTERFACE=ON -DBUILD_SHARED_LIBS=ON -DJAVA_PACKAGE=org.chocosolver.solver.constraints.real .. && \
+    make && \
+    sudo make install && \
+    export LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib/ibex/3rd
+
+RUN git clone --recurse-submodules https://github.com/chocoteam/choco-solver.git && \
+    cd choco-solver && \
+    # git checkout develop && \
+    mvn -q clean install -DskipTests
+RUN cd choco-solver && \
+    # exporting LD_LIBRARY_PATH twice (or at least here) is mandatory
+    export LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib/ibex/3rd && \
+    mvn --file pom.xml test -DtestFailureIgnore=true -Dgroups=ibex

scripts/install-ibex.sh

@@ -1,20 +1,21 @@
 #!/usr/bin/env bash  
 set -ex
 # download Ibex and untar it
-ibexver=2.8.8
-ibexjavaver=1.2.0
+root=$(pwd)
+ibexver=2.9.1
 curl https://codeload.github.com/ibex-team/ibex-lib/tar.gz/ibex-${ibexver} > ibex-${ibexver}.tar.gz
 tar -xzf ibex-${ibexver}.tar.gz
-curl https://codeload.github.com/ibex-team/ibex-java/tar.gz/${ibexjavaver} > ibex-java-${ibexjavaver}.tar.gz
-tar -xzf ibex-java-${ibexjavaver}.tar.gz --directory ibex-lib-ibex-${ibexver}/plugins/
+
 # prepare installation
 cd ibex-lib-ibex-${ibexver}
-./waf configure --enable-shared --with-jni --java-package-name=org.chocosolver.solver.constraints.real
-./waf build
-sudo ./waf install
-export LD_LIBRARY_PATH=/usr/local/lib
-cd -
+mkdir build
+cd build
+cmake -DLP_LIB=soplex -DBUILD_JAVA_INTERFACE=ON -DBUILD_SHARED_LIBS=ON -DJAVA_PACKAGE=org.chocosolver.solver.constraints.real ..
+make
+sudo make install
+export LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib/ibex/3rd
+
+cd ${root}
 sudo rm -r ibex-${ibexver}.tar.gz
-sudo rm -r ibex-java-${ibexjavaver}.tar.gz
 
 ibexsolve -v

solver/pom.xml

@@ -114,7 +114,7 @@
                 <configuration>
                     <!--suppress UnresolvedMavenProperty -->
 <!--                    <argLine>${argLine} -Xms384m -Xmx768m -Djava.library.path=/usr/local/lib</argLine>-->
-                    <argLine>${argLine} -Djava.library.path=/usr/local/lib</argLine>
+                    <argLine>${argLine} -Djava.library.path=/usr/local/lib:/usr/local/lib/ibex/3rd</argLine>
                     <properties>
                         <property>
                             <name>listener</name>

solver/src/main/java/org/chocosolver/solver/Solver.java

@@ -401,7 +401,6 @@ private boolean initialize() {
         M.setTopDecisionPosition(0);
         pushTrail(); // store state before initial propagation; w = 0 -> 1
         try {
-            checkTasks();
             mMeasures.incFixpointCount();
             // check sat
             if (isLCG() && !getSat().ok_) {
@@ -569,16 +568,6 @@ private void checkExplainedConstraints() {
         }
     }
 
-    private void checkTasks() throws ContradictionException {
-        if (mModel.getHook(Model.TASK_SET_HOOK_NAME) != null) {
-            //noinspection unchecked
-            ArrayList<Task> tset = (ArrayList<Task>) mModel.getHook(Model.TASK_SET_HOOK_NAME);
-            for (int i = 0; i < tset.size(); i++) {
-                tset.get(i).ensureBoundConsistency();
-            }
-        }
-    }
-
     /**
      * Push a world on the environment's stack, and same for MiniSat if relevant
      */
@@ -836,7 +825,6 @@ public void propagate() throws ContradictionException {
         if (!engine.isInitialized()) {
             engine.initialize();
         }
-        checkTasks();
         try {
             engine.propagate();
         } finally {

solver/src/main/java/org/chocosolver/solver/constraints/IConstraintFactory.java

@@ -22,7 +22,7 @@
  *
  * @author Jean-Guillaume FAGES
  */
-public interface IConstraintFactory extends IIntConstraintFactory, IRealConstraintFactory, ISetConstraintFactory, IGraphConstraintFactory {
+public interface IConstraintFactory extends IIntConstraintFactory, IRealConstraintFactory, ISchedulingFactory, ISetConstraintFactory, IGraphConstraintFactory {
 
     /**
      * Create a constraint that acts as an observer.