From 9b225108fa2238dbfe782aa550382743c8f4480a Mon Sep 17 00:00:00 2001
From: Lennart Eichhorn <lennart@madmanfred.com>
Date: Sat, 30 May 2020 14:16:44 +0200
Subject: [PATCH] Renamed mutation method in Mutator.
---
src/main/java/Interfaces/Mutator.java | 2 +-
src/main/java/MainClasses/GeneticAlgorithm.java | 2 +-
src/main/java/Mutators/Crossover.java | 2 +-
src/main/java/Mutators/SinglePoint.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/Interfaces/Mutator.java b/src/main/java/Interfaces/Mutator.java
index 39c7c9a..68acd2c 100644
--- a/src/main/java/Interfaces/Mutator.java
+++ b/src/main/java/Interfaces/Mutator.java
@@ -5,7 +5,7 @@ import MainClasses.Candidate;
public interface Mutator {
- Candidate[] mutatePopulation(Candidate[] population);
+ Candidate[] generateMutatedPopulation(Candidate[] population);
//TODO Remove, when decided on FRL vs NESW
static <T extends Enum<?>> boolean isFRLEncoding(Class<T> possibleDirections) {
diff --git a/src/main/java/MainClasses/GeneticAlgorithm.java b/src/main/java/MainClasses/GeneticAlgorithm.java
index 0b6105d..bc063fd 100644
--- a/src/main/java/MainClasses/GeneticAlgorithm.java
+++ b/src/main/java/MainClasses/GeneticAlgorithm.java
@@ -130,7 +130,7 @@ public class GeneticAlgorithm {
this.population = this.selector.selectNewPopulation(this.population, this.fitness, this.totalFitness);
for (Mutator m : mutators) { // SinglePoint and Crossover at the moment
- this.population = m.mutatePopulation(this.population);
+ this.population = m.generateMutatedPopulation(this.population);
}
System.out.println();
diff --git a/src/main/java/Mutators/Crossover.java b/src/main/java/Mutators/Crossover.java
index 3b17e24..07bf1b1 100644
--- a/src/main/java/Mutators/Crossover.java
+++ b/src/main/java/Mutators/Crossover.java
@@ -27,7 +27,7 @@ public class Crossover<T extends Enum<?>> implements Mutator {
}
@Override
- public Candidate[] mutatePopulation(Candidate[] population) {
+ public Candidate[] generateMutatedPopulation(Candidate[] population) {
Candidate[] mutatedPopulation = new Candidate[population.length];
if (this.crossoverChance > crossoverMinimalChance) {
int populationSize = population.length;
diff --git a/src/main/java/Mutators/SinglePoint.java b/src/main/java/Mutators/SinglePoint.java
index 8b1e2fa..72aa6ac 100644
--- a/src/main/java/Mutators/SinglePoint.java
+++ b/src/main/java/Mutators/SinglePoint.java
@@ -27,7 +27,7 @@ public class SinglePoint<T extends Enum<?>> implements Mutator {
}
@Override
- public Candidate[] mutatePopulation(Candidate[] population) {
+ public Candidate[] generateMutatedPopulation(Candidate[] population) {
Candidate[] mutatedPopulation = new Candidate[population.length];
if (this.mutationChance > mutationMinimalChance) {
--
GitLab