Skip to content

Commit

Permalink
initiate release 4.10.14
Browse files Browse the repository at this point in the history
  • Loading branch information
cprudhom committed Nov 2, 2023
1 parent 673a7f8 commit 9ebd4a2
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 22 deletions.
18 changes: 9 additions & 9 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
Expand Down Expand Up @@ -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`
Expand Down Expand Up @@ -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
Expand All @@ -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)`.
Expand Down Expand Up @@ -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)`.
Expand All @@ -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`
Expand Down Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -125,7 +125,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>4.10.13</version>
<version>4.10.14</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.choco-solver</groupId>
<artifactId>choco</artifactId>
<version>4.10.14-SNAPSHOT</version>
<version>4.10.14</version>
</parent>
<artifactId>examples</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion parsers/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.choco-solver</groupId>
<artifactId>choco</artifactId>
<version>4.10.14-SNAPSHOT</version>
<version>4.10.14</version>
</parent>
<artifactId>choco-parsers</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion parsers/src/main/minizinc/choco.msc
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
2 changes: 1 addition & 1 deletion parsers/src/main/minizinc/fzn-choco
Original file line number Diff line number Diff line change
Expand Up @@ -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="\
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.choco-solver</groupId>
<artifactId>choco</artifactId>
<version>4.10.14-SNAPSHOT</version>
<version>4.10.14</version>
<packaging>pom</packaging>
<name>choco</name>
<url>http://choco-solver.org/</url>
Expand Down
6 changes: 2 additions & 4 deletions scripts/set_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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>.*</version>%<version>$VERSION</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

Expand All @@ -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
Expand All @@ -60,7 +58,7 @@ else
sedInPlace '6 i\
\
NEXT MILESTONE\
-------------------\
---------------------\
\
### Major features:\
\
Expand Down
2 changes: 1 addition & 1 deletion solver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.choco-solver</groupId>
<artifactId>choco</artifactId>
<version>4.10.14-SNAPSHOT</version>
<version>4.10.14</version>
</parent>
<artifactId>choco-solver</artifactId>
<packaging>jar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public interface IOutputFactory extends ISelf<Solver> {
* 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.
Expand Down

0 comments on commit 9ebd4a2

Please sign in to comment.