Skip to content
Snippets Groups Projects
Commit 46b8fc94 authored by Bernhard Johannes Berger's avatar Bernhard Johannes Berger
Browse files

Fixed fitness functions.

parent 0e10f377
No related branches found
No related tags found
No related merge requests found
Pipeline #240377 passed
......@@ -118,7 +118,7 @@ public abstract class DensityBasedFitness extends FitnessDecorator {
final double probability = probabilityCalculator.apply(sourceData, targetData, candidate, predictedValue);
// DO WE HAVE TO FIX THIS?
fitness[i] = -((Math.abs(current[i])) * Math.pow(probability, rootExponent) + (1 - probability) * 1 / Math.pow(probability, exponent));
fitness[i] = current[i] * Math.pow(probability, rootExponent) + (1 - probability) * 1 / Math.pow(probability, exponent);
}
return fitness;
......
......@@ -5,17 +5,13 @@ import de.evoal.core.api.board.BlackboardEntry;
import de.evoal.core.api.ea.fitness.FitnessFunction;
import de.evoal.core.api.properties.Properties;
import de.evoal.core.api.properties.PropertiesSpecification;
import de.evoal.core.api.properties.PropertySpecification;
import de.evoal.core.api.utils.Requirements;
import de.evoal.languages.model.ddl.DataDescription;
import de.evoal.languages.model.instance.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.math3.util.Pair;
import javax.enterprise.context.Dependent;
import javax.inject.Inject;
import javax.inject.Named;
import java.util.stream.Stream;
@Dependent
@Named("distance")
......@@ -39,14 +35,14 @@ public class DistanceFitness extends FitnessDecorator {
final double result[] = new double[target.length];
for(int i = 0; i < target.length; ++i) {
result[i] = difference(target[i], current[i]);
result[i] = distance(target[i], current[i]);
}
return result;
}
private double difference(final Object o, final double v) {
return ((Number)o).doubleValue() - v;
private double distance(final Object o, final double v) {
return Math.abs(((Number)o).doubleValue() - v);
}
@Override
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment