Merge branch 'develop' into 114-posix-permissions-not-supported-in-windows

src/evoal/plugins/de.evoal.surrogate.api/pom.xml

@@ -41,13 +41,6 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>io.jenetics</groupId>
-			<artifactId>jenetics</artifactId>
-			<version>${jenetics.version}</version>
-			<scope>provided</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>

src/evoal/plugins/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/ea/TrainingRepairStrategy.java

@@ -8,7 +8,6 @@ import de.evoal.core.api.properties.stream.PropertiesStreamSupplier;
 import de.evoal.optimisation.api.constraints.strategies.RepairStrategy;
 import de.evoal.languages.model.base.Instance;
 import de.evoal.surrogate.api.SurrogateBlackboardEntries;
-import io.jenetics.util.RandomRegistry;
 import lombok.extern.slf4j.Slf4j;
 
 import javax.enterprise.context.Dependent;
@@ -16,6 +15,8 @@ import javax.inject.Inject;
 import javax.inject.Named;
 import java.io.File;
 import java.util.List;
+import java.util.Random;
+import java.util.random.RandomGenerator;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -34,6 +35,8 @@ public class TrainingRepairStrategy implements RepairStrategy {
 
     private List<Properties> trainingData;
 
+    private final RandomGenerator random = new Random();
+
     @Override
     public RepairStrategy init(final Instance configuration) {
         final String filename = board.get(SurrogateBlackboardEntries.SURROGATE_TRAINING_DATA_FILE);
@@ -61,8 +64,7 @@ public class TrainingRepairStrategy implements RepairStrategy {
 
     @Override
     public Properties apply(final Properties candidate, long generation) {
-        int index = RandomRegistry.random()
-                                  .nextInt(0, trainingData.size());
+        final int index = random.nextInt(0, trainingData.size());
 
         return trainingData.get(index);
     }

src/evoal/plugins/de.evoal.surrogate.api/src/main/java/module-info.java

@@ -15,9 +15,7 @@ module de.evoal.surrogate.api {
 
     requires com.fasterxml.jackson.databind;
 
-    requires commons.math3;
     requires smile.math;
-    requires io.jenetics.base;
 
     requires de.evoal.languages.model.ddl;
     requires de.evoal.languages.model.dl;