diff --git a/CHANGES.md b/CHANGES.md index aa11e95f18..e8be451453 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,8 +4,8 @@ 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. -NEXT MILESTONE -------------------- +4.10.14 - 02 Nov 2023 +--------------------- ### Major features: - NEW: `solver..showRestarts();` to display the number of restarts during the search. @@ -30,7 +30,7 @@ See [milestone 4.10.14](https://github.com/chocoteam/choco-solver/milestone/38) **Full Changelog**: https://github.com/chocoteam/choco-solver/compare/v4.10.13...v4.10.14 4.10.13 - 05 Jun 2023 -------------------- +--------------------- ### Major features: Mainly bug fixes and improvements of Pareto front performances. @@ -60,7 +60,7 @@ See [milestone 4.10.12](https://github.com/chocoteam/choco-solver/milestone/xx) - [Charles Prud'homme](https://github.com/cprudhom) (@cprudhom) 4.10.11 - 07 Feb 2023 -------------------- +--------------------- ### Major features: - Correcting the lack of filtering in `PropIncreasing` @@ -98,7 +98,7 @@ See [milestone 4.10.11](https://github.com/chocoteam/choco-solver/milestone/xx) - [Charles Prud'homme](https://github.com/cprudhom) (@cprudhom) 4.10.10 - 11 Oct 2022 -------------------- +--------------------- ### Major features: - Fix performance issue of ViewDeltaMonitor @@ -120,7 +120,7 @@ See [milestone 4.10.10](https://github.com/chocoteam/choco-solver/milestone/xx) - [Mehmet Hakan Satman](https://github.com/jbytecode) (@jbytecode) 4.10.9 - 22 Aug 2022 -------------------- +-------------------- ### Major features: - It is now possible to declare hints to help the search finding a first solution. See `solver.addHint(var, val)`. @@ -187,7 +187,7 @@ See [milestone 4.10.9](https://github.com/chocoteam/choco-solver/milestone/xx) - [Arthur Godet](https://github.com/ArthurGodet) (@ArthurGodet) 4.10.8 - 07 Jan 2022 -------------------- +-------------------- ### Major features: - Propagation is now observable, `solver.observePropagation(PropagationObserver)`. @@ -211,7 +211,7 @@ See [milestone 4.10.8](https://github.com/chocoteam/choco-solver/milestone/xx) - [Charles Prud'homme](https://github.com/cprudhom) (@cprudhom) 4.10.7 - 11 Oct 2021 -------------------- +-------------------- ### Major features: - Simplify the way deltamonitors work. There is no need to `freeze` and `unfreeze` @@ -252,7 +252,7 @@ See [milestone 4.10.7](https://github.com/chocoteam/choco-solver/milestone/xx) - [Charles Vernerey](https://github.com/ChaVer) (@chaver) 4.10.6 - 11 Dec 2020 -------------------- +-------------------- ### Major features: - Add new resolution helper in `Solver`, namely `findOptimalSolutionWithBounds`. See Javadoc for details and usages. diff --git a/README.md b/README.md index 77dbd7d90f..8bbe1eae1b 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Choco-solver is an open-source Java library for Constraint Programming. -Current stable version is 4.10.13 (05 Jun 2023). +Current stable version is 4.10.14 (02 Nov 2023). Choco-solver comes with: - various type of variables (integer, boolean, set, graph and real), @@ -125,7 +125,7 @@ So you only have to edit your `pom.xml` to declare the following library depende org.choco-solver choco-solver - 4.10.13 + 4.10.14 ``` diff --git a/examples/pom.xml b/examples/pom.xml index a15343a97b..cc6b52706d 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -17,7 +17,7 @@ org.choco-solver choco - 4.10.14-SNAPSHOT + 4.10.14 examples jar diff --git a/parsers/pom.xml b/parsers/pom.xml index 631481298a..c44f6c4503 100644 --- a/parsers/pom.xml +++ b/parsers/pom.xml @@ -17,7 +17,7 @@ org.choco-solver choco - 4.10.14-SNAPSHOT + 4.10.14 choco-parsers jar diff --git a/parsers/src/main/minizinc/choco.msc b/parsers/src/main/minizinc/choco.msc index cb490d1cd1..dd81565b0f 100644 --- a/parsers/src/main/minizinc/choco.msc +++ b/parsers/src/main/minizinc/choco.msc @@ -2,7 +2,7 @@ "id": "org.choco.choco", "name": "Choco-solver", "description": "Choco FlatZinc executable", - "version" : "4.10.14-231102", + "version" : "4.10.14", "mznlib" : "/Users/kyzrsoze/Sources/CHOCO/continuous-branch/parsers/src/main/minizinc/mzn_lib/", "executable" : "/Users/kyzrsoze/Sources/CHOCO/continuous-branch/parsers/src/main/minizinc/fzn-choco", "tags": ["cp","int"], diff --git a/parsers/src/main/minizinc/fzn-choco b/parsers/src/main/minizinc/fzn-choco index f27095e8ce..4d9449a15c 100755 --- a/parsers/src/main/minizinc/fzn-choco +++ b/parsers/src/main/minizinc/fzn-choco @@ -10,7 +10,7 @@ SEED=0 NB_NODES=1 TIME_LIMIT=-1 DIR=`dirname "$0"` -CHOCO_JAR=/Users/kyzrsoze/Sources/CHOCO/continuous-branch/parsers/target/choco-parsers-4.10.14-SNAPSHOT-light.jar +CHOCO_JAR=/Users/kyzrsoze/Sources/CHOCO/continuous-branch/parsers/target/choco-parsers-4.10.14-light.jar #${DIR}/${JAR_NAME} usage="\ diff --git a/pom.xml b/pom.xml index 6fbdbae7a1..6585693182 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 4.0.0 org.choco-solver choco - 4.10.14-SNAPSHOT + 4.10.14 pom choco http://choco-solver.org/ diff --git a/scripts/set_version.sh b/scripts/set_version.sh index 3933adb89c..05d9022e2f 100755 --- a/scripts/set_version.sh +++ b/scripts/set_version.sh @@ -34,7 +34,6 @@ then # Update of the version number for maven usage sedInPlace "s%Current stable version is .*.%Current stable version is $VERSION ($d).%" README.md - sedInPlace "s%The name of the jar file terms the packaging: .*%The name of the jar file terms the packaging:- \`choco-solver-$VERSION-jar-with-dependencies.jar\` or - \`choco-solver-$VERSION.jar\`.%" README.md sedInPlace "s%.*%$VERSION%" README.md sedInPlace "s%Choco-solver is distributed.*.%Choco-solver is distributed under BSD 4-Clause License \(Copyright \(c\) 1999-$YEAR, IMT Atlantique).%" README.md @@ -45,9 +44,8 @@ then sedInPlace "s%.*Constraint Programming Solver, Copyright.*% \"** Choco $VERSION \($DAT\) : Constraint Programming Solver, Copyright \(c\) 2010-$YEAR\";%" ./solver/src/main/java/org/chocosolver/solver/trace/IOutputFactory.java ## For MiniZinc - sedInPlace "s@ git fetch -q && git checkout -q .*@ git fetch -q \&\& git checkout -q $VERSION \&\& \\\@" ./parsers/src/main/minizinc/docker/Dockerfile_Choco.dms sedInPlace "s% \"version\": .*% \"version\": \"$VERSION\",%" ./parsers/src/main/minizinc/choco.msc - sedInPlace "s%CHOCO_JAR=~/.m2/.*%CHOCO_JAR=~/.m2/repository/org/choco-solver/choco-parsers/$VERSION/choco-parsers-$VERSION-jar-with-dependencies.jar%" ./parsers/src/main/minizinc/fzn-choco + sedInPlace "s%CHOCO_JAR=~/.m2/.*%CHOCO_JAR=~/.m2/repository/org/choco-solver/choco-parsers/$VERSION/choco-parsers-$VERSION-light.jar%" ./parsers/src/main/minizinc/fzn-choco ## The CHANGES.md # replace the 'NEXT MILESTONE' version by VERSION @@ -60,7 +58,7 @@ else sedInPlace '6 i\ \ NEXT MILESTONE\ --------------------\ +---------------------\ \ ### Major features:\ \ diff --git a/solver/pom.xml b/solver/pom.xml index 258e0743fd..d280aeeff4 100644 --- a/solver/pom.xml +++ b/solver/pom.xml @@ -17,7 +17,7 @@ org.choco-solver choco - 4.10.14-SNAPSHOT + 4.10.14 choco-solver jar diff --git a/solver/src/main/java/org/chocosolver/solver/trace/IOutputFactory.java b/solver/src/main/java/org/chocosolver/solver/trace/IOutputFactory.java index a36b62510a..952c8ec266 100644 --- a/solver/src/main/java/org/chocosolver/solver/trace/IOutputFactory.java +++ b/solver/src/main/java/org/chocosolver/solver/trace/IOutputFactory.java @@ -40,7 +40,7 @@ public interface IOutputFactory extends ISelf { * Default welcome message */ String WELCOME_MESSAGE = - "** Choco 4.10.13 (2023-06) : Constraint Programming Solver, Copyright (c) 2010-2023"; + "** Choco 4.10.14 (2023-11) : Constraint Programming Solver, Copyright (c) 2010-2023"; /** * Print the version message.