From 3a3ebc502b2c4ee8d793824dd44c7835ff84aad7 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Tue, 28 Oct 2014 18:53:52 +0100 Subject: [PATCH] Cleanup. --- .../strategies/BinaryScatterSearch.java | 4 ---- .../strategies/ClusteringHillClimbing.java | 4 ---- .../strategies/DifferentialEvolution.java | 5 ----- .../strategies/EvolutionaryProgramming.java | 5 ----- .../optimization/strategies/FloodAlgorithm.java | 13 ++++--------- src/eva2/optimization/strategies/HillClimbing.java | 4 ---- .../optimization/strategies/MemeticAlgorithm.java | 4 ---- .../optimization/strategies/MultiObjectiveEA.java | 4 ---- src/eva2/optimization/strategies/SteadyStateGA.java | 5 ----- 9 files changed, 4 insertions(+), 44 deletions(-) diff --git a/src/eva2/optimization/strategies/BinaryScatterSearch.java b/src/eva2/optimization/strategies/BinaryScatterSearch.java index 7991febb..446cd526 100644 --- a/src/eva2/optimization/strategies/BinaryScatterSearch.java +++ b/src/eva2/optimization/strategies/BinaryScatterSearch.java @@ -727,10 +727,6 @@ public class BinaryScatterSearch extends AbstractOptimizer implements java.io.Se this.refSetSize = pop.getTargetSize(); } - public String populationTipText() { - return "The Population"; - } - @Override public InterfaceSolutionSet getAllSolutions() { return new SolutionSet(this.refSet); diff --git a/src/eva2/optimization/strategies/ClusteringHillClimbing.java b/src/eva2/optimization/strategies/ClusteringHillClimbing.java index ade9985a..cd918c02 100644 --- a/src/eva2/optimization/strategies/ClusteringHillClimbing.java +++ b/src/eva2/optimization/strategies/ClusteringHillClimbing.java @@ -261,10 +261,6 @@ public class ClusteringHillClimbing implements InterfacePopulationChangedEventLi this.population = pop; } - public String populationTipText() { - return "Change the number of starting individuals stored (Cluster-HC)."; - } - @Override public InterfaceSolutionSet getAllSolutions() { Population tmp = new Population(); diff --git a/src/eva2/optimization/strategies/DifferentialEvolution.java b/src/eva2/optimization/strategies/DifferentialEvolution.java index 10300065..c6c09256 100644 --- a/src/eva2/optimization/strategies/DifferentialEvolution.java +++ b/src/eva2/optimization/strategies/DifferentialEvolution.java @@ -689,11 +689,6 @@ public class DifferentialEvolution extends AbstractOptimizer implements java.io. return "Differential Evolution"; } - - public String populationTipText() { - return "Edit the properties of the population used."; - } - @Override public InterfaceSolutionSet getAllSolutions() { return new SolutionSet(this.population); diff --git a/src/eva2/optimization/strategies/EvolutionaryProgramming.java b/src/eva2/optimization/strategies/EvolutionaryProgramming.java index 34914989..fbe2c02c 100644 --- a/src/eva2/optimization/strategies/EvolutionaryProgramming.java +++ b/src/eva2/optimization/strategies/EvolutionaryProgramming.java @@ -138,11 +138,6 @@ public class EvolutionaryProgramming extends AbstractOptimizer implements java.i return "EP"; } - - public String populationTipText() { - return "Edit the properties of the population used."; - } - @Override public InterfaceSolutionSet getAllSolutions() { return new SolutionSet(getPopulation()); diff --git a/src/eva2/optimization/strategies/FloodAlgorithm.java b/src/eva2/optimization/strategies/FloodAlgorithm.java index ac864b61..968b3558 100644 --- a/src/eva2/optimization/strategies/FloodAlgorithm.java +++ b/src/eva2/optimization/strategies/FloodAlgorithm.java @@ -9,6 +9,7 @@ import eva2.optimization.population.SolutionSet; import eva2.problems.B1Problem; import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; +import eva2.util.annotation.Parameter; /** * The flood algorithm, and alternative to the threshold algorithms. No really @@ -26,6 +27,8 @@ public class FloodAlgorithm extends AbstractOptimizer implements java.io.Seriali private int fitnessCallsNeeded = 0; GAIndividualBinaryData bestIndividual, testIndividual; public double initialFloodPeak = 2000.0, currentFloodPeak; + + @Parameter(name = "drainRate", description = "Set the drain rate that reduces the current flood level each generation.") public double drainRate = 1.0; public FloodAlgorithm() { @@ -193,17 +196,13 @@ public class FloodAlgorithm extends AbstractOptimizer implements java.io.Seriali return "MS-FA"; } - public String populationTipText() { - return "Change the number of best individuals stored (MS-FA)."; - } - @Override public InterfaceSolutionSet getAllSolutions() { return new SolutionSet(getPopulation()); } /** - * This methods allow you to set/get the temperatur of the flood algorithm + * This methods allow you to set/get the temperature of the flood algorithm * procedure * * @return The initial flood level. @@ -236,8 +235,4 @@ public class FloodAlgorithm extends AbstractOptimizer implements java.io.Seriali this.drainRate = 0.0; } } - - public String drainRateTipText() { - return "Set the drain rate that reduces the current flood level each generation."; - } } \ No newline at end of file diff --git a/src/eva2/optimization/strategies/HillClimbing.java b/src/eva2/optimization/strategies/HillClimbing.java index bff2f8c4..72889c38 100644 --- a/src/eva2/optimization/strategies/HillClimbing.java +++ b/src/eva2/optimization/strategies/HillClimbing.java @@ -139,8 +139,4 @@ public class HillClimbing extends AbstractOptimizer implements java.io.Serializa public InterfaceSolutionSet getAllSolutions() { return new SolutionSet(getPopulation()); } - - public String populationTipText() { - return "Change the number of best individuals stored (MS-HC)."; - } } \ No newline at end of file diff --git a/src/eva2/optimization/strategies/MemeticAlgorithm.java b/src/eva2/optimization/strategies/MemeticAlgorithm.java index c296e6fa..1a8d32ad 100644 --- a/src/eva2/optimization/strategies/MemeticAlgorithm.java +++ b/src/eva2/optimization/strategies/MemeticAlgorithm.java @@ -250,10 +250,6 @@ public class MemeticAlgorithm implements InterfaceOptimizer, java.io.Serializabl this.globalOptimizer.setPopulation(pop); } - public String populationTipText() { - return "Edit the properties of the population used."; - } - /** * Choose the global optimization strategy to use * diff --git a/src/eva2/optimization/strategies/MultiObjectiveEA.java b/src/eva2/optimization/strategies/MultiObjectiveEA.java index 7c9442e0..a7b12653 100644 --- a/src/eva2/optimization/strategies/MultiObjectiveEA.java +++ b/src/eva2/optimization/strategies/MultiObjectiveEA.java @@ -242,10 +242,6 @@ public class MultiObjectiveEA implements InterfaceOptimizer, java.io.Serializabl this.optimizer.setPopulation(pop); } - public String populationTipText() { - return "Edit the properties of the Population used."; - } - @Override public InterfaceSolutionSet getAllSolutions() { return new SolutionSet(getPopulation(), ArchivingNSGAII.getNonDominatedSortedFront(getPopulation().getArchive()).getSortedPop(new EAIndividualComparator(0))); diff --git a/src/eva2/optimization/strategies/SteadyStateGA.java b/src/eva2/optimization/strategies/SteadyStateGA.java index 647061e9..37873c45 100644 --- a/src/eva2/optimization/strategies/SteadyStateGA.java +++ b/src/eva2/optimization/strategies/SteadyStateGA.java @@ -144,11 +144,6 @@ public class SteadyStateGA extends AbstractOptimizer implements java.io.Serializ return "SS-GA"; } - - public String populationTipText() { - return "Edit the properties of the population used."; - } - @Override public InterfaceSolutionSet getAllSolutions() { return new SolutionSet(getPopulation());