diff --git a/CHANGES.md b/CHANGES.md index 0fd32b7aba..f409b1fc37 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,10 @@ This file is dedicated to sum up the new features added and bugs fixed in Choco NEXT MILESTONE ------------------- + +3.2.2 - 17 Nov 2014 +------------------- + - Fix #240: add notmember(IntVar, SetVar) constraint (more efficient than not(member)) - Fix #225: fix PropCostRegular, wrt to S.Demassey instructions. - Fix #229: create MasterSolver and SlaveSolver classes to deal with multi-thread resolution diff --git a/README.md b/README.md index 5c371dd6b7..0d799dd243 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Choco3 is an open-source Java library for Constraint Programming. Choco3 is not the continuation of Choco2, but a completely rewritten version and there is no backward compatibility. -Current stable version is 3.2.1 (13 Oct 2014). +Current stable version is 3.2.2 (17 Nov 2014). Choco3 comes with: - various type of variables (integer, boolean, set, graph and real), @@ -48,11 +48,11 @@ In the following, we distinguish two usages of Choco: - as a standalone application: the jar file includes all required dependencies and configuration file (that is, `logback.xml`), - as a library: the jar file excludes all dependencies and configuration file (that is, `logback.xml`). -The name of the jar file terms the packaging: `choco-solver-3.2.1-with-dependencies.jar` or `choco-solver-3.2.1.jar`. +The name of the jar file terms the packaging: `choco-solver-3.2.2-with-dependencies.jar` or `choco-solver-3.2.2.jar`. The jar files can be downloaded from this URL: -* http://www.emn.fr/z-info/choco-repo/mvn/repository/choco/choco-solver/3.2.1/ +* http://www.emn.fr/z-info/choco-repo/mvn/repository/choco/choco-solver/3.2.2/ ### As a stand-alone application ### @@ -88,7 +88,7 @@ Next, just declare the following library dependency: choco choco-solver - 3.2.1 + 3.2.2 ``` diff --git a/choco-samples/pom.xml b/choco-samples/pom.xml index 4b5bfbf210..8c069adb24 100644 --- a/choco-samples/pom.xml +++ b/choco-samples/pom.xml @@ -30,7 +30,7 @@ choco choco - 3.2.2-SNAPSHOT + 3.2.2 4.0.0 choco-samples diff --git a/choco-solver/pom.xml b/choco-solver/pom.xml index a0a88902f0..7bf4d4e1cc 100755 --- a/choco-solver/pom.xml +++ b/choco-solver/pom.xml @@ -31,7 +31,7 @@ choco choco - 3.2.2-SNAPSHOT + 3.2.2 4.0.0 choco-solver diff --git a/choco-solver/src/main/resources/configuration.properties b/choco-solver/src/main/resources/configuration.properties index 57c379e6ef..020bf25aa6 100644 --- a/choco-solver/src/main/resources/configuration.properties +++ b/choco-solver/src/main/resources/configuration.properties @@ -26,7 +26,7 @@ ## # Welcome message, print out when trace is on -WELCOME_TITLE=** Choco 3.2.2-SNAPSHOT (2014-10) : Constraint Programming Solver, Copyleft (c) 2010-2014 +WELCOME_TITLE=** Choco 3.2.2 (2014-11) : Constraint Programming Solver, Copyleft (c) 2010-2014 ## Configuration parameters @@ -85,4 +85,4 @@ MAX_TUPLES_FOR_TABLE_SUBS = 10000 SEARCH_BINDER_PATH="solver/search/bind/impl/StaticBinder.class" # Compact the MMD at the end of tuples addition, or during the addition -COMPACT_MDD_ONLY_ONCE=true \ No newline at end of file +COMPACT_MDD_ONLY_ONCE=true diff --git a/docs/source/3_solving.rst b/docs/source/3_solving.rst index 1db070bb8b..26b8d1794d 100644 --- a/docs/source/3_solving.rst +++ b/docs/source/3_solving.rst @@ -585,7 +585,7 @@ On a call to ``Chatterbox.printVersion()``, the following message will be printe .. code-block:: none - ** Choco 3.2.0 (2014-05) : Constraint Programming Solver, Copyleft (c) 2010-2014 + ** Choco 3.2.2 (2014-11) : Constraint Programming Solver, Copyleft (c) 2010-2014 On a call to ``Chatterbox.printVersion()``, the following message will be printed: diff --git a/docs/source/conf.py b/docs/source/conf.py index ab58fd7390..03058634d2 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -56,9 +56,9 @@ # built documents. # # The short X.Y version. -version = '3.2' +version = '3' # The full version, including alpha/beta/rc tags. -release = '3.2.1-SNAPSHOT' +release = '3.2.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -175,7 +175,7 @@ #html_show_sphinx = True # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -#html_show_copyright = True +#html_show_copyright = u'2014, Jean-Guillaume Fages, Xavier Lorca, Charles Prud\'homme' # If true, an OpenSearch description file will be output, and all pages will # contain a tag referring to it. The value of this option must be the diff --git a/pom.xml b/pom.xml index 97dfba4c6a..b4135c5c38 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ choco choco pom - 3.2.2-SNAPSHOT + 3.2.2 Choco-${project.version}: an Open-Source Constraint Solver http://choco-solver.org/ diff --git a/src/scripts/README.md b/src/scripts/README.md index 72ee3f0e49..6f2397a421 100644 --- a/src/scripts/README.md +++ b/src/scripts/README.md @@ -28,7 +28,13 @@ And update README.md with the correct versions of dependencies ./src/scripts/release.sh -7. Then, everything is achieved by Travis. However, deployment and zip file (jar files, user guide, logback configuration file and javadoc) need to be done locally: + +7. Then, everything is achieved by Travis. +Or, one can run the command by itself: + + ./src/scripts/build.sh + +However, deployment and zip file (jar files, user guide, logback configuration file and javadoc) need to be done locally: ./src/scripts/package.sh X.Y.Z diff --git a/src/scripts/set_version.sh b/src/scripts/set_version.sh index a6956467c6..c218b1c990 100755 --- a/src/scripts/set_version.sh +++ b/src/scripts/set_version.sh @@ -40,16 +40,16 @@ 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\-with\-dependencies\.jar` or `choco\-solver\-$VERSION.jar`.%" README.md + sedInPlace "s%$REPO_URL.*choco\-solver.*%$REPO_URL/choco\-solver/$VERSION/%" 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\-with\-dependencies\.jar\` or \`choco\-solver\-$VERSION.jar\`.%" README.md sedInPlace "s%.*%$VERSION%" README.md sedInPlace "s%Choco3 is distributed.*.%Choco3 is distributed under BSD licence \(Copyright \(c\) 1999-$YEAR, Ecole des Mines de Nantes).%" README.md - sedInPlace "s%$REPO_URL.*choco\-solver.*%$REPO_URL/choco\-solver/$VERSION/%" README.md ## The configuration file sedInPlace "s%WELCOME_TITLE=.*%WELCOME_TITLE=** Choco $VERSION \($DAT\) : Constraint Programming Solver, Copyleft \(c\) 2010-$YEAR%" choco-solver/src/main/resources/configuration.properties ## The doc - sedInPlace "s%** Choco .*%** Choco $VERSION \($DAT\) : Constraint Programming Solver, Copyleft \(c\) 2010-$YEAR%" docs/source/3_solving.rst + sedInPlace "s%\*\* Choco .*%** Choco $VERSION \($DAT\) : Constraint Programming Solver, Copyleft \(c\) 2010-$YEAR%" docs/source/3_solving.rst ## The CHANGES.md # replace the 'NEXT MILESTONE' version by VERSION @@ -64,8 +64,8 @@ then \ ' CHANGES.md - REGEX="s%release = *%release = ${VERSION}%" - sedInPlace "${REGEX}" ./docs/source/conf.py + sedInPlace "s%copyright = .*%copyright = u'${YEAR}, Jean-Guillaume Fages, Xavier Lorca, Charles Prud\\\'homme'%" ./docs/source/conf.py + sedInPlace "s%release = .*%release = '${VERSION}'%" ./docs/source/conf.py cd ./docs/ make latexpdf diff --git a/user_guide.pdf b/user_guide.pdf index e1e40b0264..94bb1ff0da 100644 Binary files a/user_guide.pdf and b/user_guide.pdf differ