bump dependency versions

Author: paulk-asert

gradle.properties

@@ -15,7 +15,7 @@
 #
 
 groovy3Version=3.0.12
-groovy4Version=4.0.4
+groovy4Version=4.0.6
 chocoVersion=4.10.9
 jacopVersion=4.8.0
 ortoolsVersion=9.4.1874

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

gradlew.bat

@@ -24,7 +24,7 @@ dependencies {
     implementation "org.choco-solver:choco-solver:$chocoVersion"
     implementation "org.ojalgo:ojalgo:$ojalgoVersion"
     implementation "org.jacop:jacop:$jacopVersion"
-    implementation 'org.apache.commons:commons-math3:3.6.1'
+    implementation 'org.apache.commons:commons-math4-legacy:4.0-beta1'
     implementation 'org.optaplanner:optaplanner-core:7.71.0.Final'
     implementation 'ch.qos.logback:logback-classic:1.2.11' // optional for optaplanner debugging
     implementation "com.google.ortools:ortools-java:$ortoolsVersion"

subprojects/Diet/Diet.gradle

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-//@Grab('org.apache.commons:commons-math3:3.6.1')
-import org.apache.commons.math3.optim.linear.*
-import org.apache.commons.math3.optim.nonlinear.scalar.GoalType
-import static org.apache.commons.math3.optim.linear.Relationship.*
+//@Grab('org.apache.commons:commons-math4-legacy:4.0-beta1')
+import org.apache.commons.math4.legacy.optim.linear.*
+import org.apache.commons.math4.legacy.optim.nonlinear.scalar.GoalType
+import static org.apache.commons.math4.legacy.optim.linear.Relationship.*
 
 def cost = new LinearObjectiveFunction([2.0, 3.5, 8.0, 1.5, 11.0, 1.0] as double[], 0)
 

subprojects/Diet/src/main/groovy/DietCommonsMath.groovy

@@ -21,7 +21,7 @@ repositories {
 
 dependencies {
     implementation "org.apache.groovy:groovy:$groovy4Version"
-    implementation 'org.apache.commons:commons-math3:3.6.1'
+    implementation 'org.apache.commons:commons-math4-legacy:4.0-beta1'
     implementation 'io.jenetics:jenetics:6.3.0' // 5.2.0 = JDK8, 7.0.0 = JDK17
 }
 

subprojects/Monkeys/Monkeys.gradle

@@ -1,9 +1,9 @@
-//@Grab('org.apache.commons:commons-math3:3.6.1')
+//@Grab('org.apache.commons:commons-math4:4.0-beta1')
 // inspired by https://github.com/apache/commons-math/blob/MATH_3_X/src/userguide/java/org/apache/commons/math3/userguide/genetics/HelloWorldExample.java
 
 import groovy.transform.*
-import org.apache.commons.math3.genetics.*
-import static org.apache.commons.math3.genetics.GeneticAlgorithm.randomGenerator as r
+import org.apache.commons.math4.legacy.genetics.*
+import static org.apache.commons.math4.legacy.genetics.GeneticAlgorithm.randomGenerator as r
 
 class Scenario {
     public static SENTENCE = "To be or not to be?"
@@ -19,20 +19,20 @@ double MUTATION_RATE = 0.03
 double ELITISM_RATE = 0.1
 int TOURNAMENT_ARITY = 2
 
-GeneticAlgorithm ga = new GeneticAlgorithm(
+var ga = new GeneticAlgorithm(
         new OnePointCrossover<Character>(), CROSSOVER_RATE,
         new RandomCharacterMutation(), MUTATION_RATE,
         new TournamentSelection(TOURNAMENT_ARITY))
 
-def randomSentence = (0..<Scenario.DIMENSION).collect{ Scenario.randomChar }
-def popList = (0..<POPULATION_SIZE).collect{ new StringChromosome(randomSentence) }
-Population initial = new ElitisticListPopulation(popList, 2 * popList.size(), ELITISM_RATE)
+var randomSentence = (0..<Scenario.DIMENSION).collect{ Scenario.randomChar }
+var popList = (0..<POPULATION_SIZE).collect{ new StringChromosome(randomSentence) }
+var initial = new ElitisticListPopulation(popList, 2 * popList.size(), ELITISM_RATE)
 
-def stoppingCondition = new StoppingCondition() {
+var stoppingCondition = new StoppingCondition() {
     int generation = 0
 
     boolean isSatisfied(Population population) {
-        Chromosome fittestChromosome = population.fittestChromosome
+        var fittestChromosome = population.fittestChromosome
         if (generation == 1 || generation % 10 == 0)
             println "Generation $generation: $fittestChromosome"
         generation++
@@ -41,15 +41,15 @@ def stoppingCondition = new StoppingCondition() {
 }
 
 println "Starting evolution ..."
-Population finalPopulation = ga.evolve(initial, stoppingCondition)
+var finalPopulation = ga.evolve(initial, stoppingCondition)
 println "Generation $ga.generationsEvolved: $finalPopulation.fittestChromosome"
 
 @InheritConstructors @AutoImplement
 class StringChromosome extends AbstractListChromosome<Character> {
     double fitness() {
         (0..<Scenario.DIMENSION).inject(0) { sum, i ->
-            def target = Scenario.SENTENCE.charAt(i)
-            def allele = representation.get(i).charValue()
+            var target = Scenario.SENTENCE.charAt(i)
+            var allele = representation.get(i).charValue()
             // fitter if closer ascii "distance"
             sum - (target - allele).abs()
         }
@@ -63,7 +63,7 @@ class StringChromosome extends AbstractListChromosome<Character> {
 class RandomCharacterMutation implements MutationPolicy {
     Chromosome mutate(Chromosome original) {
         int mutationIndex = r.nextInt(Scenario.DIMENSION)
-        def mutation = original.representation.toList()
+        var mutation = original.representation.toList()
         mutation.set(mutationIndex, Scenario.randomChar)
         original.newFixedLengthChromosome(mutation)
     }

subprojects/Monkeys/src/main/groovy/ShakespeareCommonsMath.groovy

@@ -6,22 +6,22 @@ import io.jenetics.*
 import io.jenetics.engine.*
 import io.jenetics.util.CharSeq
 
-def SENTENCE = "To be or not to be?"
+var SENTENCE = "To be or not to be?"
 int DIMENSION = SENTENCE.size()
-def POSSIBLE_CHARS = new CharSeq(('a'..'z') + ('A'..'Z') + " !?.".toList() as char[])
+var POSSIBLE_CHARS = new CharSeq(('a'..'z') + ('A'..'Z') + " !?.".toList() as char[])
 int SIZE = POSSIBLE_CHARS.size()
 
-def fitness = { Genotype gt ->
+var fitness = { Genotype gt ->
     (0..<DIMENSION).inject(0) { sum, i ->
-        def target = SENTENCE.charAt(i)
-        def allele = gt.chromosome().get(i).allele()
+        var target = SENTENCE.charAt(i)
+        var allele = gt.chromosome().get(i).allele()
         int exactBonus = allele == target ? 100 : 0
         sum + SIZE - (target - allele).abs() + exactBonus
     }
 }
 
-def gtf = Genotype.of([CharacterChromosome.of(POSSIBLE_CHARS, DIMENSION)])
-def engine = Engine.builder(fitness, gtf).offspringSelector(new RouletteWheelSelector()).build()
-def log = { EvolutionResult er -> if (er.generation() % 500 == 1) println er.bestPhenotype().genotype() }
-def result = engine.stream().limit(10000).peek(log).collect(EvolutionResult.toBestGenotype())
+var gtf = Genotype.of([CharacterChromosome.of(POSSIBLE_CHARS, DIMENSION)])
+var engine = Engine.builder(fitness, gtf).offspringSelector(new RouletteWheelSelector()).build()
+var log = { EvolutionResult er -> if (er.generation() % 500 == 1) println er.bestPhenotype().genotype() }
+var result = engine.stream().limit(10000).peek(log).collect(EvolutionResult.toBestGenotype())
 println "Result: $result"