initiate release 4.10.11

chocoteam · Feb 7, 2023 · da80234 · da80234
1 parent dddac76
commit da80234
Show file tree

Hide file tree

Showing 13 changed files with 45 additions and 20 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -4,11 +4,25 @@ 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.11 - 07 Feb 2023
 -------------------
 
 ### Major features:
-- Correcting the lack of filtering in `PropIncreasing` 
+- Correcting the lack of filtering in `PropIncreasing`
+- Change the SetType for the undirected graph stored in DiffN for efficiency reason
+- `SparseBitSet` for a backtrackable bitset with mostly 0s (#935)
+- Change the way restarting works: not a `Move` anymore, directly included in `Solver` (#950)
+- Simplification of objective manager (#949)
+- Calling `getValue()` on an uninstantiated variable throws an IllegalStateException (#957)
+- Change the MiniZinc complementary search to a FirstFail (instead of DomOverWDeg) (#958)
+- Reduce object creation during solving (#985)
+- Reduce object creation during propagation (#969)
+- Reduce memory footprint of `Model` (#964)
+- Add `model.getEstimatedMemory()` method
+- Add `Model` analysis (#939)
+- Add log file as RegParser option (for parsers)
+- creation of PropPower propagators with exponent as int
+
 ### Deprecated API (to be removed in next release):
 From `Solver`:
 - `Propagate getPropagate()`

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 BSD 4-Clause License
 
-Copyright (c) 2022, IMT Atlantique
+Copyright (c) 2023, IMT Atlantique
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git 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.10 (11 Oct 2022).
+Current stable version is 4.10.11 (07 Feb 2023).
 
 Choco-solver comes with:
 - various type of variables (integer, boolean, set, graph and real),
@@ -28,7 +28,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-2022, IMT Atlantique).
+Choco-solver is distributed under BSD 4-Clause License (Copyright (c) 1999-2023, IMT Atlantique).
 
 Contact:
 - [Choco-solver on Discord](https://discord.gg/aH6zxa7e64)
@@ -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.10</version>
+   <version>4.10.11</version>
 </dependency>
 ```
 

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.choco-solver</groupId>
     <artifactId>choco</artifactId>
-    <version>4.10.11-SNAPSHOT</version>
+    <version>4.10.11</version>
   </parent>
   <artifactId>examples</artifactId>
   <packaging>jar</packaging>

diff --git a/parsers/pom.xml b/parsers/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.choco-solver</groupId>
         <artifactId>choco</artifactId>
-        <version>4.10.11-SNAPSHOT</version>
+        <version>4.10.11</version>
     </parent>
     <artifactId>choco-parsers</artifactId>
     <packaging>jar</packaging>

diff --git 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.10",
+  "version": "4.10.11",
   "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/docker/Dockerfile_Choco.dms b/parsers/src/main/minizinc/docker/Dockerfile_Choco.dms
@@ -23,7 +23,7 @@ WORKDIR /src
 # Get and build of Choco-solver
 RUN	git clone https://github.com/chocoteam/choco-solver.git /choco-solver &&  \
     cd /choco-solver/ && \
-    git fetch -q && git checkout -q 4.10.9 && \
+    git fetch -q  && git checkout -q 4.10.11 && \
     git log --format="%H" -n 1 && \
     mvn -q clean install -DskipTests && \
     cd ..

diff --git 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=~/.m2/repository/org/choco-solver/choco-parsers/4.10.10/choco-parsers-4.10.10-jar-with-dependencies.jar
+CHOCO_JAR=~/.m2/repository/org/choco-solver/choco-parsers/4.10.11/choco-parsers-4.10.11-jar-with-dependencies.jar
 #${DIR}/${JAR_NAME}
 usage="\
 

diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.choco-solver</groupId>
     <artifactId>choco</artifactId>
-    <version>4.10.11-SNAPSHOT</version>
+    <version>4.10.11</version>
     <packaging>pom</packaging>
     <name>choco</name>
     <url>http://choco-solver.org/</url>

diff --git a/scripts/RELEASE.md b/scripts/RELEASE.md
@@ -1,16 +1,27 @@
 ### Steps
 
-1. Run license check:
+1. Make sure the code is stable, bug free, etc.
 
-
-    mvn license:format
+2. Check maven dependencies, update if necessary, and clean also (using archiva f-ex.)
 
-2. Update **CHANGES.md** file with authors and link to milestone.
+
+    $ mvn -U versions:display-dependency-updates
+
+    $ mvn -U versions:display-plugin-updates
+
+
+3. Check that ALL issues are reported in **CHANGES.md** files
+
+
+    ltag=`git describe --abbrev=0 --tags`;git log ${ltag}..master | grep "#[0-9]"
+
+
+4. Update **CHANGES.md** file with authors and link to milestone.
 
 
     ltag=`git describe --abbrev=0 --tags`;git log --format='%aE' ${ltag}..master|sort -u
 
-3. Now you can run the command: 
+5. Now you can run the command: 
 
 
     ./scritps/release.sh
diff --git a/scripts/set_version.sh b/scripts/set_version.sh
@@ -44,7 +44,7 @@ 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 master.*%    git fetch -q && git checkout -q $VERSION && \ %"  ./parsers/src/main/minizinc/docker/Dockerfile_Choco.dms
+    sedInPlace "s#    git fetch -q && git checkout -q .*#    git fetch -q  \&\& git checkout -q 4.10.11 \&\& \\\#"  ./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
 

diff --git a/solver/pom.xml b/solver/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.choco-solver</groupId>
         <artifactId>choco</artifactId>
-        <version>4.10.11-SNAPSHOT</version>
+        <version>4.10.11</version>
     </parent>
     <artifactId>choco-solver</artifactId>
     <packaging>jar</packaging>

diff --git a/solver/src/main/java/org/chocosolver/solver/trace/IOutputFactory.java b/solver/src/main/java/org/chocosolver/solver/trace/IOutputFactory.java
@@ -42,7 +42,7 @@ public interface IOutputFactory extends ISelf<Solver> {
      * Default welcome message
      */
     String WELCOME_MESSAGE =
-        "** Choco 4.10.10 (2022-10) : Constraint Programming Solver, Copyright (c) 2010-2022";
+        "** Choco 4.10.11 (2023-02) : Constraint Programming Solver, Copyright (c) 2010-2023";
 
     /**
      * Print the version message.