Merge branch 'release-5.0.0'

Author: cprudhom

.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

@@ -4,6 +4,98 @@ Choco Solver ChangeLog
 This file is dedicated to sum up the new features added and bugs fixed in Choco-solver since the version, 4.0.0.
 **Note**: double-space is replaced by "\t" character on release process. Make sure the format is ok.
 
+5.0.0 - 02 Feb 2026
+---------------------
+
+### Major features:
+
+This set of commits delivers a major consolidation of Lazy Clause Generation, 
+significant performance and memory improvements, 
+more robust constraint handling, 
+and a broad cleanup and modernization of the internal APIs and tooling.
+
+#### Performance & Algorithms
+- Significant performance improvements on:
+- Core propagators (X+Y=Z, abs, div, sum, scalar, etc.)
+- CompactTable (CT) and STR2+
+- Memory management and estimation mechanisms
+- Dynamic selection of table algorithms based on memory footprint
+- Optimizations in MiniSat and SAT-related components (clause reduction, propagation, assertions)
+
+#### Lazy Clause Generation (LCG)
+- Major consolidation effort on LCG:
+- Fixes for critical bugs (initialization, reification, lost propagations)
+- New assertions and invariants
+- Improved separation and handling of learnt clauses (failure vs prohibiting-solution)
+- Extended LCG support for constraints such as abs, div, table, element
+- Better interaction with:
+    - Restart strategies
+    - ParallelPortfolio
+    - Explanation and Reason APIs
+
+#### Constraints & Modeling
+- Refactoring or improvement of many constraints:
+- AllDifferent, AllDifferentExcept*
+- Cumulative, DiffN, BinPacking, Element, Table
+- Arithmetic constraints (abs, div, times, min/max)
+- Smarter choice between decomposition and extension
+- Improved expression recognition and handling (XCSP / Flatzinc)
+#### Testing & Robustness
+- Numerous test fixes and stabilizations
+- Addition of new tests, especially for LCG and XCSP
+- Timeout adjustments
+- Cleanup of memory-intensive or unstable tests
+#### XCSP / Flatzinc / Parsing
+- Update of XCSP3 tools (v2.5)
+- Improvements in parsing and expression handling
+- Better support for:
+  - Negative values
+  - Constants
+  - Variable groups and restarts
+- Competition-oriented adjustments for XCSP and Flatzinc
+#### Search & Strategies
+- Enhancements to:
+  - RoundRobin strategies
+  - Dom/Wdeg and ConflictHistorySearch
+  - MetaStrategy framework
+- New parameters and more robust default behaviors
+- Simplification and clarification of search-related APIs
+#### Refactoring & API Evolution
+- Large-scale code cleanup:
+  - Removal of obsolete classes
+  - Simplification of core APIs (IntVar, Decision, Reason)
+- Improved and updated Javadoc
+- Clearer separation of responsibilities between Solver, MiniSat, and learning components
+#### Build, CI & Tooling
+- Updates to Maven configuration, Docker, and Makefiles
+- CI workflow adjustments (tests, snapshots, releases)
+- Preparation of intermediate and beta releases
+
+
+
+### Deprecated API (to be removed in next release):
+
+### Other closed issues and pull requests:
+See [milestone 5.0.0-beta.2](https://github.com/chocoteam/choco-solver/milestone/40)
+
+- 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)
+- [Sulian Le Bozec Chiffoleau](https://github.com/SulianLBC) (@SulianLBC)
+
+
+**Full Changelog**: https://github.com/chocoteam/choco-solver/compare/v5.0.0-beta.1...v5.0.0-beta.2
+
 5.0.0-beta.1 - 17 Feb 2025
 --------------------------
 

LICENSE

@@ -1,6 +1,6 @@
 BSD 4-Clause License
 
-Copyright (c) 2025, IMT Atlantique
+Copyright (c) 2026, IMT Atlantique
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

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\]")
 
@@ -49,12 +49,12 @@ compile:
 
 tests : 1s 10s ibex checker mzn xcsp mps dimacs expl lcg
 
-1s 10s ibex checker mzn xcsp mps dimacs lcg: compile
-	mvn -q test -DtestFailureIgnore=true -Dgroups="$@"
+1s 10s ibex checker mzn xcsp mps dimacs 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:

README.md

@@ -17,7 +17,7 @@
 
 Choco-solver is an open-source Java library for Constraint Programming.
 
-Current stable version is 5.0.0-beta.1 (17 Feb 2025).
+Current stable version is 5.0.0 (02 Feb 2026).
 
 Choco-solver comes with:
 - various type of variables (integer, boolean, set, graph and real),
@@ -27,7 +27,7 @@ Choco-solver comes with:
 
 But also, facilities to interact with the search loop, factories to help modelling, many samples, etc.
 
-Choco-solver is distributed under BSD 4-Clause License (Copyright (c) 1999-2025, IMT Atlantique).
+Choco-solver is distributed under BSD 4-Clause License (Copyright (c) 1999-2026, IMT Atlantique).
 
 Contact:
 - [Choco-solver on Discord](https://discord.gg/aH6zxa7e64)
@@ -124,7 +124,7 @@ So you only have to edit your `pom.xml` to declare the following library depende
 <dependency>
    <groupId>org.choco-solver</groupId>
    <artifactId>choco-solver</artifactId>
-   <version>5.0.0-beta.1</version>
+   <version>5.0.0</version>
 </dependency>
 ```
 

examples/pom.xml

@@ -2,7 +2,7 @@
 
     This file is part of examples, http://choco-solver.org/
 
-    Copyright (c) 2025, IMT Atlantique. All rights reserved.
+    Copyright (c) 2026, IMT Atlantique. All rights reserved.
 
     Licensed under the BSD 4-clause license.
 
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.choco-solver</groupId>
     <artifactId>choco</artifactId>
-    <version>5.0.0-beta.1</version>
+    <version>5.0.0</version>
   </parent>
   <artifactId>examples</artifactId>
   <packaging>jar</packaging>

examples/src/main/java/module-info.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of examples, http://choco-solver.org/
  *
- * Copyright (c) 2025, IMT Atlantique. All rights reserved.
+ * Copyright (c) 2026, IMT Atlantique. All rights reserved.
  *
  * Licensed under the BSD 4-clause license.
  *

examples/src/main/java/org/chocosolver/examples/AbstractProblem.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of examples, http://choco-solver.org/
  *
- * Copyright (c) 2025, IMT Atlantique. All rights reserved.
+ * Copyright (c) 2026, IMT Atlantique. All rights reserved.
  *
  * Licensed under the BSD 4-clause license.
  *

examples/src/main/java/org/chocosolver/examples/integer/AirPlaneLanding.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of examples, http://choco-solver.org/
  *
- * Copyright (c) 2025, IMT Atlantique. All rights reserved.
+ * Copyright (c) 2026, IMT Atlantique. All rights reserved.
  *
  * Licensed under the BSD 4-clause license.
  *

examples/src/main/java/org/chocosolver/examples/integer/AllIntervalSeries.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of examples, http://choco-solver.org/
  *
- * Copyright (c) 2025, IMT Atlantique. All rights reserved.
+ * Copyright (c) 2026, IMT Atlantique. All rights reserved.
  *
  * Licensed under the BSD 4-clause license.
  *