Merge branch 'hotfix-4.10.16'

Author: cprudhom

.github/workflows/codeql-analysis.yml

@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, develop ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ master, develop ]
   schedule:
     - cron: '0 0 * * 0'
 

.github/workflows/draft-pdf.yml

@@ -1,6 +1,9 @@
 name: Draft JOSS Paper
 
-on: [push]
+on:
+  push:
+    tags:
+      - 'v*'
 
 jobs:
   paper:

.github/workflows/maven-publish.yml

@@ -3,11 +3,7 @@
 
 name: Java CI with Maven
 
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+on: [push, pull_request]
 
 jobs:
   test-solver:

.github/workflows/maven-test.yml

@@ -6,8 +6,8 @@ on:
     workflows: [ "Java CI with Maven" ]
     types: [completed]
   push:
-    branches:
-      - master
+    branches: [ develop ]
+    tags: [ 'v*' ]
 
 jobs:
   publish:
@@ -26,8 +26,9 @@ jobs:
           server-password: MAVEN_PASSWORD
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
           gpg-passphrase: MAVEN_GPG_PASSPHRASE
+
       - name: publish packages
-        run: mvn -P ossrhDeploy --batch-mode -DskipTests javadoc:aggregate-jar source:jar deploy
+        run: mvn -s scripts/settings.xml -P ossrhDeploy --batch-mode -DskipTests javadoc:aggregate-jar source:jar deploy
         env:
           MAVEN_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}

.github/workflows/publish-snapshot.yml

@@ -4,6 +4,14 @@ 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.
 
+4.10.16 - 12 Sep 2024
+-------------------
+
+### Hotfix
+- Fix bug in `IntAffineView` (#1101)
+
+**Full Changelog**: https://github.com/chocoteam/choco-solver/compare/v4.10.15...v4.10.16
+
 4.10.15 - 09 Sep 2024
 -------------------
 

CHANGES.md

@@ -18,7 +18,7 @@
 
 Choco-solver is an open-source Java library for Constraint Programming.
 
-Current stable version is 4.10.15 (09 Sep 2024).
+Current stable version is 4.10.16 (12 Sep 2024).
 
 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
 <dependency>
    <groupId>org.choco-solver</groupId>
    <artifactId>choco-solver</artifactId>
-   <version>4.10.15</version>
+   <version>4.10.16</version>
 </dependency>
 ```
 

README.md

@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.choco-solver</groupId>
     <artifactId>choco</artifactId>
-    <version>4.10.15</version>
+    <version>4.10.16</version>
   </parent>
   <artifactId>examples</artifactId>
   <packaging>jar</packaging>

examples/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.choco-solver</groupId>
         <artifactId>choco</artifactId>
-        <version>4.10.15</version>
+        <version>4.10.16</version>
     </parent>
     <artifactId>choco-parsers</artifactId>
     <packaging>jar</packaging>

parsers/pom.xml

@@ -126,7 +126,7 @@ public Thread actionOnKill() {
     @Override
     public void createSolver() {
         if (level.isLoggable(Level.COMPET)) {
-            System.out.println("%% Choco 240909_14:08");
+            System.out.println("%% Choco 240912_11:16");
         }
         super.createSolver();
         datas = new Datas[nb_cores];

parsers/src/main/java/org/chocosolver/parser/flatzinc/Flatzinc.java

@@ -70,7 +70,7 @@ public Thread actionOnKill() {
     public void createSolver() {
         super.createSolver();
         if (level.isLoggable(Level.COMPET)) {
-            System.out.println("c Choco 240909_14:08");
+            System.out.println("c Choco 240912_11:16");
         }
         String iname = Paths.get(instance).getFileName().toString();
         parsers = new XCSPParser[nb_cores];

parsers/src/main/java/org/chocosolver/parser/xcsp/XCSP.java

@@ -7,7 +7,7 @@
 import sys
 
 # THIS IS WHERE YOU NEED TO CHANGE THE PATH TO THE JAR FILE
-JAR_FILE='~/.m2/repository/org/choco-solver/choco-parsers/4.10.15/choco-parsers-4.10.15-light.jar'
+JAR_FILE='~/.m2/repository/org/choco-solver/choco-parsers/4.10.16/choco-parsers-4.10.16-light.jar'
 
 JVM_ARGS = '-server -Xss64M -Xms2G -Xmx8G -XX:NewSize=512M'
 LOG_LEVEL = 'COMPET'

parsers/src/main/minizinc/fzn-choco.py

@@ -15,7 +15,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.choco-solver</groupId>
     <artifactId>choco</artifactId>
-    <version>4.10.15</version>
+    <version>4.10.16</version>
     <packaging>pom</packaging>
     <name>choco</name>
     <url>http://choco-solver.org/</url>

pom.xml

@@ -29,6 +29,7 @@ then
     DAT=$(LANG=en_US.utf8 date +"%Y-%m")
     YEAR=$(LANG=en_US.utf8 date +"%Y")
     d=$(LANG=en_US.utf8 date +"%d %b %Y")
+    DATE=$(LANG=en_US.utf8 date +'%y%m%d_%H:%M')
 
     ## The README.md
     # Update of the version number for maven usage
@@ -42,6 +43,8 @@ then
 
     ## The configuration file
     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
+    sedInPlace "s|            System.out.println(\"c Choco .*|            System.out.println(\"c Choco $DATE\");|" parsers/src/main/java/org/chocosolver/parser/xcsp/XCSP.java
+    sedInPlace "s|            System.out.println(\"%% Choco .*|            System.out.println(\"%% Choco $DATE\");|" parsers/src/main/java/org/chocosolver/parser/flatzinc/Flatzinc.java
 
     ## For MiniZinc
     sedInPlace "s%  \"version\": .*%  \"version\": \"$VERSION\",%"  ./parsers/src/main/minizinc/choco.msc

scripts/set_version.sh

@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.choco-solver</groupId>
         <artifactId>choco</artifactId>
-        <version>4.10.15</version>
+        <version>4.10.16</version>
     </parent>
     <artifactId>choco-solver</artifactId>
     <packaging>jar</packaging>

solver/pom.xml

@@ -40,7 +40,7 @@ public interface IOutputFactory extends ISelf<Solver> {
      * Default welcome message
      */
     String WELCOME_MESSAGE =
-        "** Choco 4.10.15 (2024-09) : Constraint Programming Solver, Copyright (c) 2010-2024";
+        "** Choco 4.10.16 (2024-09) : Constraint Programming Solver, Copyright (c) 2010-2024";
 
     /**
      * Print the version message.

solver/src/main/java/org/chocosolver/solver/trace/IOutputFactory.java

@@ -501,15 +501,15 @@ public ICause getCause() {
     }
 
     @Override
-    public boolean equals(Object o) {
+    public final boolean equals(Object o) {
         if (this == o) return true;
         if (!(o instanceof AbstractVariable)) return false;
         AbstractVariable that = (AbstractVariable) o;
         return ID == that.ID;
     }
 
     @Override
-    public int hashCode() {
+    public final int hashCode() {
         return ID;
     }
 }

solver/src/main/java/org/chocosolver/solver/variables/impl/AbstractVariable.java

@@ -536,15 +536,6 @@ public boolean hasEnumeratedDomain() {
         return var.hasEnumeratedDomain() || a > 1;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof IntAffineView)) return false;
-
-        IntAffineView<?> intView = (IntAffineView<?>) o;
-        if (!var.equals(intView.var)) return false;
-        return a == intView.a && b == intView.b && p == intView.p;
-    }
 
     public boolean equals(IntVar v, int a, int b) {
         if (!this.var.equals(v)) return false;