From f4148a0d98128705e5825d07df71feacf58d73ef Mon Sep 17 00:00:00 2001
From: "Bernhard J. Berger" <bernhard.berger@uni-bremen.de>
Date: Wed, 18 Jan 2023 00:00:36 +0100
Subject: [PATCH] Minor fixes.
---
.../comparator/WeightedSumFitnessValue.java | 4 +--
.../core/main/search/HeuristicSearch.java | 2 --
.../individuals/IndividualStatistics.java | 2 +-
.../main/ea/TrainingDataProducer.java | 33 -------------------
4 files changed, 3 insertions(+), 38 deletions(-)
delete mode 100644 src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/ea/TrainingDataProducer.java
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/comparator/WeightedSumFitnessValue.java b/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/comparator/WeightedSumFitnessValue.java
index 6d77df73..e7f0bb89 100644
--- a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/comparator/WeightedSumFitnessValue.java
+++ b/src/core/de.evoal.core/src/main/java/de/evoal/core/main/ea/comparator/WeightedSumFitnessValue.java
@@ -41,8 +41,8 @@ public class WeightedSumFitnessValue implements FitnessValue {
double otherFitness = 0.0;
for(int index = 0; index < fitnessValues.length; ++index) {
- ownFitness = ownFitness - this.normalizedWeights[index] * Math.abs(this.fitnessValues[index]);
- otherFitness = otherFitness - this.normalizedWeights[index] * Math.abs(((WeightedSumFitnessValue)other).getFitnessValues()[index]);
+ ownFitness = ownFitness + this.normalizedWeights[index] * Math.abs(this.fitnessValues[index]);
+ otherFitness = otherFitness + this.normalizedWeights[index] * Math.abs(((WeightedSumFitnessValue)other).getFitnessValues()[index]);
}
return ownFitness == otherFitness ? 0 : (int)Math.signum(ownFitness - otherFitness);
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/search/HeuristicSearch.java b/src/core/de.evoal.core/src/main/java/de/evoal/core/main/search/HeuristicSearch.java
index f8643e3f..d70e8419 100644
--- a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/search/HeuristicSearch.java
+++ b/src/core/de.evoal.core/src/main/java/de/evoal/core/main/search/HeuristicSearch.java
@@ -106,8 +106,6 @@ public class HeuristicSearch {
public void run() {
setup();
- final Factory<Genotype<?>> gtf = encoding.encoding();
-
final Constraint<?, FitnessValue> constraint = new ConstraintList(constraints.get());
final Engine<?, FitnessValue> engine= Engine.builder(this.fitnessFunction, encoding)
diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/statistics/individuals/IndividualStatistics.java b/src/core/de.evoal.core/src/main/java/de/evoal/core/main/statistics/individuals/IndividualStatistics.java
index 910cba1f..e5834fa8 100644
--- a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/statistics/individuals/IndividualStatistics.java
+++ b/src/core/de.evoal.core/src/main/java/de/evoal/core/main/statistics/individuals/IndividualStatistics.java
@@ -35,7 +35,7 @@ public class IndividualStatistics implements StatisticsWriter {
@Inject
private CustomCodec encoding;
- @Inject @Named("surrogate-source-properties-specification")
+ @Inject @Named("genotype-specification")
private PropertiesSpecification sourceSpecification;
@Inject
diff --git a/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/ea/TrainingDataProducer.java b/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/ea/TrainingDataProducer.java
deleted file mode 100644
index 503ab19d..00000000
--- a/src/core/de.evoal.surrogate.api/src/main/java/de/evoal/surrogate/main/ea/TrainingDataProducer.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package de.evoal.surrogate.main.ea;
-
-import de.evoal.core.api.board.Blackboard;
-import de.evoal.core.api.board.BlackboardEntry;
-import de.evoal.core.api.properties.PropertiesSpecification;
-import de.evoal.core.api.properties.stream.FileBasedPropertiesStreamSupplier;
-import de.evoal.surrogate.api.SurrogateBlackboardEntry;
-import de.evoal.surrogate.api.training.TrainingDataManager;
-import lombok.extern.slf4j.Slf4j;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
-import java.io.File;
-
-@ApplicationScoped
-@Slf4j
-public class TrainingDataProducer {
- /*
- public void setTrainingData(final @Observes BlackboardEntry event, final Blackboard board, final TrainingDataManager manager) {
- if (!event.isSame(SurrogateBlackboardEntry.SURROGATE_TRAINING_DATA_FILE)) {
- return;
- }
-
- final String filename = board.get(SurrogateBlackboardEntry.SURROGATE_TRAINING_DATA_FILE);
- final File trainingFile = new File(filename);
-
- log.info("Using training data from {}.", filename);
-
- // TODO FIXME PROPERTIES
- manager.setTrainingStream(new FileBasedPropertiesStreamSupplier(trainingFile, PropertiesSpecification.builder().build()));
- }
- */
-}
--
GitLab