diff --git a/src/main/java/Interfaces/Mutator.java b/src/main/java/Interfaces/Mutator.java index 39c7c9a17bc268e1696f750df9651f7e60eb1374..68acd2cdbf7fe0698372ede083378e9e31cea316 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 0b6105d9f7ee852aadc1d821010e22d5e77b4f0f..bc063fdf5c4047765e900146e20840f1a47bcff1 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 3b17e2416c43ce73bb766286119ce89052711d70..07bf1b1b6bb4c862885c3c1a22663cf317b5a54e 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 8b1e2fa4f533402bab3026082998c84b88e6bf75..72aa6ac659a48e0a33a48d38e063312b80dbe2a9 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) {