From ab914e8c3ca84301d3be72d1e78429e28eabfb4c Mon Sep 17 00:00:00 2001
From: "Bernhard J. Berger" <bernhard.berger@uni-bremen.de>
Date: Thu, 19 Jan 2023 01:08:59 +0100
Subject: [PATCH] Reverted last commit.
---
.../approximative/density/ea/fitness/DensityBasedFitness.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/core/de.evoal.approximative.density/src/main/java/de/evoal/approximative/density/ea/fitness/DensityBasedFitness.java b/src/core/de.evoal.approximative.density/src/main/java/de/evoal/approximative/density/ea/fitness/DensityBasedFitness.java
index d7108f21..7c36e1cc 100644
--- a/src/core/de.evoal.approximative.density/src/main/java/de/evoal/approximative/density/ea/fitness/DensityBasedFitness.java
+++ b/src/core/de.evoal.approximative.density/src/main/java/de/evoal/approximative/density/ea/fitness/DensityBasedFitness.java
@@ -137,7 +137,7 @@ public abstract class DensityBasedFitness extends FitnessDecorator {
final double probability = sourceData[i].probability(((Number)candidate.get(i)).doubleValue());
final double offset = 1 / ((Number)ranges.get(surrogate.getInputSpecification().get(i))).doubleValue();
- result *= Math.max(1.0, probability + offset);
+ result *= Math.min(1.0, probability + offset);
}
return result;
@@ -150,6 +150,6 @@ public abstract class DensityBasedFitness extends FitnessDecorator {
final double probability = targetData.probability(predicted);
final double offset = 1 / ((Number)ranges.get(surrogate.getOutputSpecification().get(0))).doubleValue();
- return Math.max(1.0, probability + offset);
+ return Math.min(1.0, probability + offset);
}
}
--
GitLab