From a42bbf685a0e8eca95324b63a3a425dbcee49ab0 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Sat, 25 Oct 2014 01:27:18 +0200 Subject: [PATCH] Remove setIdentifier/getIdentifier from InterfaceOptimizer as it was not used. refs #2 --- src/eva2/OptimizerFactory.java | 1 - .../strategies/ArtificialBeeColony.java | 58 +++++++++++++++---- src/eva2/optimization/strategies/BOA.java | 13 ----- .../strategies/BinaryScatterSearch.java | 10 ---- .../CHCAdaptiveSearchAlgorithm.java | 15 ----- .../strategies/ClusterBasedNichingEA.java | 15 ----- .../strategies/ClusteringHillClimbing.java | 10 ---- .../strategies/DifferentialEvolution.java | 19 ++---- .../optimization/strategies/EsDpiNiching.java | 10 ---- .../strategies/EvolutionStrategies.java | 15 ----- .../strategies/EvolutionaryProgramming.java | 15 ----- .../strategies/FloodAlgorithm.java | 15 ----- .../strategies/GeneticAlgorithm.java | 20 ------- .../strategies/GradientDescentAlgorithm.java | 20 ------- .../optimization/strategies/HillClimbing.java | 20 ------- .../strategies/InterfaceOptimizer.java | 9 --- .../strategies/IslandModelEA.java | 23 ++------ src/eva2/optimization/strategies/LTGA.java | 10 ---- src/eva2/optimization/strategies/MLTGA.java | 10 ---- .../strategies/MemeticAlgorithm.java | 15 ----- .../strategies/MonteCarloSearch.java | 15 ----- .../strategies/MultiObjectiveCMAES.java | 22 ------- .../strategies/MultiObjectiveEA.java | 15 ----- .../strategies/NelderMeadSimplex.java | 11 ---- .../optimization/strategies/NichePSO.java | 18 ------ .../ParticleFilterOptimization.java | 15 ----- .../strategies/ParticleSwarmOptimization.java | 16 ----- .../PopulationBasedIncrementalLearning.java | 15 ----- .../strategies/ScatterSearch.java | 10 ---- .../strategies/SimulatedAnnealing.java | 15 ----- .../strategies/SteadyStateGA.java | 15 ----- .../strategies/ThresholdAlgorithm.java | 15 ----- src/eva2/optimization/strategies/Tribes.java | 10 ---- .../strategies/WingedMultiObjectiveEA.java | 15 ----- 34 files changed, 54 insertions(+), 476 deletions(-) diff --git a/src/eva2/OptimizerFactory.java b/src/eva2/OptimizerFactory.java index 7beb4517..1bf54a8f 100644 --- a/src/eva2/OptimizerFactory.java +++ b/src/eva2/OptimizerFactory.java @@ -356,7 +356,6 @@ public class OptimizerFactory { setTemplateOperators(problem, mutator, 1., new NoCrossover(), 0); HillClimbing hc = new HillClimbing(); - hc.setIdentifier("-" + popSize + "-" + mutator.getStringRepresentation()); hc.getPopulation().setTargetSize(popSize); hc.addPopulationChangedEventListener(listener); hc.setProblem(problem); diff --git a/src/eva2/optimization/strategies/ArtificialBeeColony.java b/src/eva2/optimization/strategies/ArtificialBeeColony.java index c35ee60a..e75b9b70 100644 --- a/src/eva2/optimization/strategies/ArtificialBeeColony.java +++ b/src/eva2/optimization/strategies/ArtificialBeeColony.java @@ -8,6 +8,8 @@ import eva2.problems.F1Problem; import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; +import java.util.ArrayList; + /** * */ @@ -17,6 +19,8 @@ public class ArtificialBeeColony implements InterfaceOptimizer { protected AbstractOptimizationProblem optimizationProblem = new F1Problem(); protected Population population; + private ArrayList populationChangedEventListeners; + public ArtificialBeeColony() { } @@ -37,12 +41,15 @@ public class ArtificialBeeColony implements InterfaceOptimizer { @Override public void addPopulationChangedEventListener(InterfacePopulationChangedEventListener ea) { - + if (populationChangedEventListeners == null) { + populationChangedEventListeners = new ArrayList<>(); + } + populationChangedEventListeners.add(ea); } @Override public boolean removePopulationChangedEventListener(InterfacePopulationChangedEventListener ea) { - return false; + return populationChangedEventListeners != null && populationChangedEventListeners.remove(ea); } @Override @@ -50,13 +57,50 @@ public class ArtificialBeeColony implements InterfaceOptimizer { } + /** + * This method will initialize the optimizer with a given population + * + * @param pop The initial population + * @param reset If true the population is reset. + */ @Override public void initializeByPopulation(Population pop, boolean reset) { + this.population = (Population) pop.clone(); + if (reset) { + this.population.init(); + this.evaluatePopulation(this.population); + this.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED); + } + } + /** + * Something has changed + * + * @param name Event name + */ + protected void firePropertyChangedEvent(String name) { + if (this.populationChangedEventListeners != null) { + for (InterfacePopulationChangedEventListener listener : this.populationChangedEventListeners) { + listener.registerPopulationStateChanged(this, name); + } + } + } + + /** + * This method will evaluate the current population using the given problem. + * + * @param population The population that is to be evaluated + */ + private void evaluatePopulation(Population population) { + this.optimizationProblem.evaluate(population); + population.incrGeneration(); } @Override public void optimize() { + /** + * + */ } @@ -75,16 +119,6 @@ public class ArtificialBeeColony implements InterfaceOptimizer { return null; } - @Override - public void setIdentifier(String name) { - - } - - @Override - public String getIdentifier() { - return null; - } - /** * This method will set the problem that is to be optimized * diff --git a/src/eva2/optimization/strategies/BOA.java b/src/eva2/optimization/strategies/BOA.java index 5261d833..299fc9c6 100644 --- a/src/eva2/optimization/strategies/BOA.java +++ b/src/eva2/optimization/strategies/BOA.java @@ -558,16 +558,6 @@ public class BOA implements InterfaceOptimizer, java.io.Serializable { return new SolutionSet(this.population); } - @Override - public void setIdentifier(String name) { - this.identifier = name; - } - - @Override - public String getIdentifier() { - return this.identifier; - } - @Override public void setProblem(InterfaceOptimizationProblem problem) { this.problem = (AbstractOptimizationProblem) problem; @@ -583,9 +573,6 @@ public class BOA implements InterfaceOptimizer, java.io.Serializable { return "Bayesian Network"; } - // ------------------------------- - // -------------GUI--------------- - // ------------------------------- public int getNumberOfParents() { return this.numberOfParents; } diff --git a/src/eva2/optimization/strategies/BinaryScatterSearch.java b/src/eva2/optimization/strategies/BinaryScatterSearch.java index c1e798ce..e83f2ba3 100644 --- a/src/eva2/optimization/strategies/BinaryScatterSearch.java +++ b/src/eva2/optimization/strategies/BinaryScatterSearch.java @@ -761,16 +761,6 @@ public class BinaryScatterSearch implements InterfaceOptimizer, java.io.Serializ return new SolutionSet(this.refSet); } - @Override - public void setIdentifier(String name) { - this.identifier = name; - } - - @Override - public String getIdentifier() { - return this.identifier; - } - @Override public void setProblem(InterfaceOptimizationProblem problem) { this.problem = (AbstractOptimizationProblem) problem; diff --git a/src/eva2/optimization/strategies/CHCAdaptiveSearchAlgorithm.java b/src/eva2/optimization/strategies/CHCAdaptiveSearchAlgorithm.java index 49d9173b..ed4aa7d0 100644 --- a/src/eva2/optimization/strategies/CHCAdaptiveSearchAlgorithm.java +++ b/src/eva2/optimization/strategies/CHCAdaptiveSearchAlgorithm.java @@ -287,21 +287,6 @@ public class CHCAdaptiveSearchAlgorithm implements InterfaceOptimizer, java.io.S return result; } - /** - * This method allows you to set an identifier for the algorithm - * - * @param name The indenifier - */ - @Override - public void setIdentifier(String name) { - this.identifier = name; - } - - @Override - public String getIdentifier() { - return this.identifier; - } - /** * This method will return a naming String * diff --git a/src/eva2/optimization/strategies/ClusterBasedNichingEA.java b/src/eva2/optimization/strategies/ClusterBasedNichingEA.java index 687699d1..f358e2a4 100644 --- a/src/eva2/optimization/strategies/ClusterBasedNichingEA.java +++ b/src/eva2/optimization/strategies/ClusterBasedNichingEA.java @@ -837,21 +837,6 @@ public class ClusterBasedNichingEA implements InterfacePopulationChangedEventLis return result; } - /** - * This method allows you to set an identifier for the algorithm - * - * @param name The indenifier - */ - @Override - public void setIdentifier(String name) { - this.identifier = name; - } - - @Override - public String getIdentifier() { - return this.identifier; - } - /** * This method will return a naming String diff --git a/src/eva2/optimization/strategies/ClusteringHillClimbing.java b/src/eva2/optimization/strategies/ClusteringHillClimbing.java index 41513523..ade9985a 100644 --- a/src/eva2/optimization/strategies/ClusteringHillClimbing.java +++ b/src/eva2/optimization/strategies/ClusteringHillClimbing.java @@ -99,16 +99,6 @@ public class ClusteringHillClimbing implements InterfacePopulationChangedEventLi setLocalSearchMethod(getLocalSearchMethod()); } - @Override - public void setIdentifier(String name) { - this.identifier = name; - } - - @Override - public String getIdentifier() { - return this.identifier; - } - /** * This method will set the problem that is to be optimized * diff --git a/src/eva2/optimization/strategies/DifferentialEvolution.java b/src/eva2/optimization/strategies/DifferentialEvolution.java index 35d81831..09086e32 100644 --- a/src/eva2/optimization/strategies/DifferentialEvolution.java +++ b/src/eva2/optimization/strategies/DifferentialEvolution.java @@ -518,11 +518,15 @@ public class DifferentialEvolution implements InterfaceOptimizer, java.io.Serial */ public void optimizeGenerational() { int parentIndex; + + // Initialize or clear child population if (children == null) { children = new Population(population.size()); } else { children.clear(); } + + // Create a new population based on the old one for (int i = 0; i < this.population.size(); i++) { if (cyclePop) { parentIndex = i; @@ -728,21 +732,6 @@ public class DifferentialEvolution implements InterfaceOptimizer, java.io.Serial return result; } - /** - * This method allows you to set an identifier for the algorithm - * - * @param name The identifier - */ - @Override - public void setIdentifier(String name) { - this.identifier = name; - } - - @Override - public String getIdentifier() { - return this.identifier; - } - /** * This method will return a naming String * diff --git a/src/eva2/optimization/strategies/EsDpiNiching.java b/src/eva2/optimization/strategies/EsDpiNiching.java index 939d97ca..ccef940b 100644 --- a/src/eva2/optimization/strategies/EsDpiNiching.java +++ b/src/eva2/optimization/strategies/EsDpiNiching.java @@ -925,16 +925,6 @@ public class EsDpiNiching implements InterfaceOptimizer, Serializable, Interface return new SolutionSet(getPopulation(), peaks); } - @Override - public String getIdentifier() { - return identifier; - } - - @Override - public void setIdentifier(String name) { - identifier = name; - } - @Override public void setPopulation(Population pop) { // this might cause problems if the pop.size() does not fit the EsDpiNiching parameters mu/lamba per peak diff --git a/src/eva2/optimization/strategies/EvolutionStrategies.java b/src/eva2/optimization/strategies/EvolutionStrategies.java index cab948e6..b62904a7 100644 --- a/src/eva2/optimization/strategies/EvolutionStrategies.java +++ b/src/eva2/optimization/strategies/EvolutionStrategies.java @@ -333,21 +333,6 @@ public class EvolutionStrategies implements InterfaceOptimizer, java.io.Serializ origPopSize = population.getTargetSize(); } - /** - * This method allows you to set an identifier for the algorithm - * - * @param name The indenifier - */ - @Override - public void setIdentifier(String name) { - this.identifier = name; - } - - @Override - public String getIdentifier() { - return this.identifier; - } - /** * These are for GUI */ diff --git a/src/eva2/optimization/strategies/EvolutionaryProgramming.java b/src/eva2/optimization/strategies/EvolutionaryProgramming.java index 42f76b66..5ff09e68 100644 --- a/src/eva2/optimization/strategies/EvolutionaryProgramming.java +++ b/src/eva2/optimization/strategies/EvolutionaryProgramming.java @@ -170,21 +170,6 @@ public class EvolutionaryProgramming implements InterfaceOptimizer, java.io.Seri return result; } - /** - * This method allows you to set an identifier for the algorithm - * - * @param name The indenifier - */ - @Override - public void setIdentifier(String name) { - this.identifier = name; - } - - @Override - public String getIdentifier() { - return this.identifier; - } - /** * This method will return a naming String * diff --git a/src/eva2/optimization/strategies/FloodAlgorithm.java b/src/eva2/optimization/strategies/FloodAlgorithm.java index 2e386483..7cbac3c1 100644 --- a/src/eva2/optimization/strategies/FloodAlgorithm.java +++ b/src/eva2/optimization/strategies/FloodAlgorithm.java @@ -235,21 +235,6 @@ public class FloodAlgorithm implements InterfaceOptimizer, java.io.Serializable return result; } - /** - * This method allows you to set an identifier for the algorithm - * - * @param name The indenifier - */ - @Override - public void setIdentifier(String name) { - this.identifier = name; - } - - @Override - public String getIdentifier() { - return this.identifier; - } - /** * This method will return a naming String * diff --git a/src/eva2/optimization/strategies/GeneticAlgorithm.java b/src/eva2/optimization/strategies/GeneticAlgorithm.java index 06b99068..268df1ee 100644 --- a/src/eva2/optimization/strategies/GeneticAlgorithm.java +++ b/src/eva2/optimization/strategies/GeneticAlgorithm.java @@ -226,26 +226,6 @@ public class GeneticAlgorithm implements InterfaceOptimizer, java.io.Serializabl return result; } - /** - * This method allows you to set an identifier for the algorithm. - * - * @param name The identifier - */ - @Override - public void setIdentifier(String name) { - this.identifier = name; - } - - @Override - public String getIdentifier() { - return this.identifier; - } - - /** - * ******************************************************************************************************************** - * These are for GUI - */ - /** * This method will return a naming String * diff --git a/src/eva2/optimization/strategies/GradientDescentAlgorithm.java b/src/eva2/optimization/strategies/GradientDescentAlgorithm.java index 641bd0d0..90478331 100644 --- a/src/eva2/optimization/strategies/GradientDescentAlgorithm.java +++ b/src/eva2/optimization/strategies/GradientDescentAlgorithm.java @@ -317,29 +317,9 @@ public class GradientDescentAlgorithm implements InterfaceOptimizer, java.io.Ser @Override public void setPopulation(Population pop) { -// Hashtable newindyhash = new Hashtable(); -// for (int i = 0; i < pop.size(); i++) { -// if (indyhash.contains(pop.get(i))) newindyhash.put(pop.get(i), indyhash.get(pop.get(i))); -// } -// indyhash = newindyhash; this.population = pop; } - /** - * This method allows you to set an identifier for the algorithm - * - * @param name The indenifier - */ - @Override - public void setIdentifier(String name) { - this.identifier = name; - } - - @Override - public String getIdentifier() { - return this.identifier; - } - @Override public void setProblem(InterfaceOptimizationProblem problem) { diff --git a/src/eva2/optimization/strategies/HillClimbing.java b/src/eva2/optimization/strategies/HillClimbing.java index c36ab9c8..fe9a2f97 100644 --- a/src/eva2/optimization/strategies/HillClimbing.java +++ b/src/eva2/optimization/strategies/HillClimbing.java @@ -190,26 +190,6 @@ public class HillClimbing implements InterfaceOptimizer, java.io.Serializable { return result; } - /** - * This method allows you to set an identifier for the algorithm - * - * @param name The indenifier - */ - @Override - public void setIdentifier(String name) { - this.identifier = name; - } - - @Override - public String getIdentifier() { - return this.identifier; - } - - /** - * ******************************************************************************************************************** - * These are for GUI - */ - /** * This method will return a naming String * diff --git a/src/eva2/optimization/strategies/InterfaceOptimizer.java b/src/eva2/optimization/strategies/InterfaceOptimizer.java index aba93aba..f83ba563 100644 --- a/src/eva2/optimization/strategies/InterfaceOptimizer.java +++ b/src/eva2/optimization/strategies/InterfaceOptimizer.java @@ -77,15 +77,6 @@ public interface InterfaceOptimizer { */ InterfaceSolutionSet getAllSolutions(); - /** - * This method allows you to set an identifier for the algorithm - * - * @param name The identifier - */ - void setIdentifier(String name); - - String getIdentifier(); - /** * This method will set the problem that is to be optimized. The problem * should be initialized when this method is called. diff --git a/src/eva2/optimization/strategies/IslandModelEA.java b/src/eva2/optimization/strategies/IslandModelEA.java index 20207247..64016f4b 100644 --- a/src/eva2/optimization/strategies/IslandModelEA.java +++ b/src/eva2/optimization/strategies/IslandModelEA.java @@ -92,7 +92,7 @@ public class IslandModelEA implements InterfacePopulationChangedEventListener, I this.islands = new InterfaceOptimizer[this.numLocalCPUs]; for (int i = 0; i < this.numLocalCPUs; i++) { this.islands[i] = (InterfaceOptimizer) this.optimizer.clone(); - this.islands[i].setIdentifier("" + i); + //this.islands[i].setIdentifier("" + i); this.islands[i].initialize(); if (this.logLocalChanges) { this.islands[i].addPopulationChangedEventListener(this); @@ -161,7 +161,7 @@ public class IslandModelEA implements InterfacePopulationChangedEventListener, I this.islands = new InterfaceOptimizer[this.numLocalCPUs]; for (int i = 0; i < this.numLocalCPUs; i++) { this.islands[i] = (InterfaceOptimizer) this.optimizer.clone(); - this.islands[i].setIdentifier("" + i); + //this.islands[i].setIdentifier("" + i); this.islands[i].initialize(); if (this.logLocalChanges) { this.islands[i].addPopulationChangedEventListener(this); @@ -386,21 +386,6 @@ public class IslandModelEA implements InterfacePopulationChangedEventListener, I //System.exit(0); } - /** - * This method allows you to set an identifier for the algorithm - * - * @param name The indenifier - */ - @Override - public void setIdentifier(String name) { - this.identifier = name; - } - - @Override - public String getIdentifier() { - return this.identifier; - } - /** * This method will return the Optimizers * @@ -434,9 +419,9 @@ public class IslandModelEA implements InterfacePopulationChangedEventListener, I @Override public void registerPopulationStateChanged(Object source, String name) { InterfaceOptimizer opt = (InterfaceOptimizer) source; - int sourceID = Integer.parseInt(opt.getIdentifier()); + int sourceID = 12; //Integer.parseInt(opt.getIdentifier()); double cFCOpt = opt.getPopulation().getFunctionCalls(); - double plotValue = (this.optimizationProblem.getDoublePlotValue(opt.getPopulation())).doubleValue(); + double plotValue = this.optimizationProblem.getDoublePlotValue(opt.getPopulation()); if (this.show) { this.plot.setConnectedPoint(cFCOpt, plotValue, (sourceID + 1)); diff --git a/src/eva2/optimization/strategies/LTGA.java b/src/eva2/optimization/strategies/LTGA.java index af229016..a513593f 100644 --- a/src/eva2/optimization/strategies/LTGA.java +++ b/src/eva2/optimization/strategies/LTGA.java @@ -326,16 +326,6 @@ public class LTGA implements InterfaceOptimizer, java.io.Serializable, Interface return new SolutionSet(this.population); } - @Override - public void setIdentifier(String name) { - this.identifier = name; - } - - @Override - public String getIdentifier() { - return this.identifier; - } - @Override public void setProblem(InterfaceOptimizationProblem problem) { this.problem = (AbstractOptimizationProblem) problem; diff --git a/src/eva2/optimization/strategies/MLTGA.java b/src/eva2/optimization/strategies/MLTGA.java index f17fb3c8..42f46e26 100644 --- a/src/eva2/optimization/strategies/MLTGA.java +++ b/src/eva2/optimization/strategies/MLTGA.java @@ -307,16 +307,6 @@ public class MLTGA implements InterfaceOptimizer, java.io.Serializable, Interfac return new SolutionSet(this.population); } - @Override - public void setIdentifier(String name) { - this.identifier = name; - } - - @Override - public String getIdentifier() { - return this.identifier; - } - @Override public void setProblem(InterfaceOptimizationProblem problem) { this.problem = (AbstractOptimizationProblem) problem; diff --git a/src/eva2/optimization/strategies/MemeticAlgorithm.java b/src/eva2/optimization/strategies/MemeticAlgorithm.java index 20565588..8362c578 100644 --- a/src/eva2/optimization/strategies/MemeticAlgorithm.java +++ b/src/eva2/optimization/strategies/MemeticAlgorithm.java @@ -223,21 +223,6 @@ public class MemeticAlgorithm implements InterfaceOptimizer, return result; } - /** - * This method allows you to set an identifier for the algorithm - * - * @param name The indenifier - */ - @Override - public void setIdentifier(String name) { - this.identifier = name; - } - - @Override - public String getIdentifier() { - return this.identifier; - } - /** * This method will return a naming String diff --git a/src/eva2/optimization/strategies/MonteCarloSearch.java b/src/eva2/optimization/strategies/MonteCarloSearch.java index 685803a1..bce82d15 100644 --- a/src/eva2/optimization/strategies/MonteCarloSearch.java +++ b/src/eva2/optimization/strategies/MonteCarloSearch.java @@ -207,21 +207,6 @@ public class MonteCarloSearch implements InterfaceOptimizer, java.io.Serializabl return result; } - /** - * This method allows you to set an identifier for the algorithm - * - * @param name The indenifier - */ - @Override - public void setIdentifier(String name) { - this.identifier = name; - } - - @Override - public String getIdentifier() { - return this.identifier; - } - /** * This method will return a naming String diff --git a/src/eva2/optimization/strategies/MultiObjectiveCMAES.java b/src/eva2/optimization/strategies/MultiObjectiveCMAES.java index a3dfe8a2..ee14b033 100644 --- a/src/eva2/optimization/strategies/MultiObjectiveCMAES.java +++ b/src/eva2/optimization/strategies/MultiObjectiveCMAES.java @@ -67,18 +67,6 @@ public class MultiObjectiveCMAES implements InterfaceOptimizer, Serializable { .setHideProperty(this.getClass(), "population", true); } - /* - * (non-Javadoc) - * - * @see - * eva2.optimization.strategies.InterfaceOptimizer#setIdentifier(java.lang. - * String) - */ - @Override - public void setIdentifier(String name) { - identifier = name; - } - /* * (non-Javadoc) * @@ -113,16 +101,6 @@ public class MultiObjectiveCMAES implements InterfaceOptimizer, Serializable { return new SolutionSet(pop, pop); } - /* - * (non-Javadoc) - * - * @see eva2.optimization.strategies.InterfaceOptimizer#getIdentifier() - */ - @Override - public String getIdentifier() { - return identifier; - } - /* * (non-Javadoc) * diff --git a/src/eva2/optimization/strategies/MultiObjectiveEA.java b/src/eva2/optimization/strategies/MultiObjectiveEA.java index 30a32089..81d176f2 100644 --- a/src/eva2/optimization/strategies/MultiObjectiveEA.java +++ b/src/eva2/optimization/strategies/MultiObjectiveEA.java @@ -215,21 +215,6 @@ public class MultiObjectiveEA implements InterfaceOptimizer, java.io.Serializabl return result; } - /** - * This method allows you to set an identifier for the algorithm - * - * @param name The indenifier - */ - @Override - public void setIdentifier(String name) { - this.identifier = name; - } - - @Override - public String getIdentifier() { - return this.identifier; - } - /** * This method will return a naming String * diff --git a/src/eva2/optimization/strategies/NelderMeadSimplex.java b/src/eva2/optimization/strategies/NelderMeadSimplex.java index 6c444bac..004c6fbe 100644 --- a/src/eva2/optimization/strategies/NelderMeadSimplex.java +++ b/src/eva2/optimization/strategies/NelderMeadSimplex.java @@ -56,11 +56,6 @@ public class NelderMeadSimplex implements InterfaceOptimizer, Serializable, Inte return new NelderMeadSimplex(this); } - @Override - public void setIdentifier(String name) { - identifier = name; - } - @Override public void setProblem(InterfaceOptimizationProblem problem) { optimizationProblem = (AbstractOptimizationProblem) problem; @@ -221,11 +216,6 @@ public class NelderMeadSimplex implements InterfaceOptimizer, Serializable, Inte return e_ind; } - @Override - public String getIdentifier() { - return identifier; - } - @Override public String getName() { return identifier; @@ -360,7 +350,6 @@ public class NelderMeadSimplex implements InterfaceOptimizer, Serializable, Inte /** * This method creates a Nelder-Mead instance. * - * @param pop The size of the population * @param problem The problem to be optimized * @param listener * @return An optimization procedure that performs nelder mead optimization. diff --git a/src/eva2/optimization/strategies/NichePSO.java b/src/eva2/optimization/strategies/NichePSO.java index eddda9d2..fb705974 100644 --- a/src/eva2/optimization/strategies/NichePSO.java +++ b/src/eva2/optimization/strategies/NichePSO.java @@ -1291,24 +1291,6 @@ public class NichePSO implements InterfaceAdditionalPopulationInformer, Interfac getSubswarmOptimizerTemplate().setProblem(problem); } - /** - * @param name The indenifier - * @tested nn This method allows you to set an identifier for the algorithm - */ - @Override - public void setIdentifier(String name) { - this.identifier = name; - } - - /** - * @tested nn (non-Javadoc) - * @see javaeva.server.oa.go.Strategies.InterfaceOptimizer#getIdentifier() - */ - @Override - public String getIdentifier() { - return this.identifier; - } - /** * ******************************************************************************************************************** * getter: "descriptive parameters" for the mainswarm and subswarms diff --git a/src/eva2/optimization/strategies/ParticleFilterOptimization.java b/src/eva2/optimization/strategies/ParticleFilterOptimization.java index e64e835a..2470ae09 100644 --- a/src/eva2/optimization/strategies/ParticleFilterOptimization.java +++ b/src/eva2/optimization/strategies/ParticleFilterOptimization.java @@ -306,21 +306,6 @@ public class ParticleFilterOptimization implements InterfaceOptimizer, java.io.S return strB.toString(); } - /** - * This method allows you to set an identifier for the algorithm - * - * @param name The indenifier - */ - @Override - public void setIdentifier(String name) { - this.identifier = name; - } - - @Override - public String getIdentifier() { - return this.identifier; - } - /** * This method will return a naming String * diff --git a/src/eva2/optimization/strategies/ParticleSwarmOptimization.java b/src/eva2/optimization/strategies/ParticleSwarmOptimization.java index 07a5c809..0ff7a99d 100644 --- a/src/eva2/optimization/strategies/ParticleSwarmOptimization.java +++ b/src/eva2/optimization/strategies/ParticleSwarmOptimization.java @@ -1521,21 +1521,6 @@ public class ParticleSwarmOptimization implements InterfaceOptimizer, java.io.Se return result; } - /** - * This method allows you to set an identifier for the algorithm - * - * @param name The indenifier - */ - @Override - public void setIdentifier(String name) { - this.indentifier = name; - } - - @Override - public String getIdentifier() { - return this.indentifier; - } - /** * This method will return a naming String * @@ -1543,7 +1528,6 @@ public class ParticleSwarmOptimization implements InterfaceOptimizer, java.io.Se */ @Override public String getName() { -// return "PSO-"+getTopology()+getTopologyRange()+(isDoLocalSearch() ? "-ls_" : "_")+getPhi1()+"_"+getPhi2(); return "PSO-" + getTopology() + getTopologyRange() + "_" + getPhi1() + "_" + getPhi2(); } diff --git a/src/eva2/optimization/strategies/PopulationBasedIncrementalLearning.java b/src/eva2/optimization/strategies/PopulationBasedIncrementalLearning.java index 1a08385e..8ce4d605 100644 --- a/src/eva2/optimization/strategies/PopulationBasedIncrementalLearning.java +++ b/src/eva2/optimization/strategies/PopulationBasedIncrementalLearning.java @@ -199,21 +199,6 @@ public class PopulationBasedIncrementalLearning implements InterfaceOptimizer, j return result; } - /** - * This method allows you to set an identifier for the algorithm - * - * @param name The indenifier - */ - @Override - public void setIdentifier(String name) { - this.identifier = name; - } - - @Override - public String getIdentifier() { - return this.identifier; - } - /** * This method will return a naming String * diff --git a/src/eva2/optimization/strategies/ScatterSearch.java b/src/eva2/optimization/strategies/ScatterSearch.java index 267fb505..c3f1e7b0 100644 --- a/src/eva2/optimization/strategies/ScatterSearch.java +++ b/src/eva2/optimization/strategies/ScatterSearch.java @@ -679,11 +679,6 @@ public class ScatterSearch implements InterfaceOptimizer, java.io.Serializable, return RNG.randomDouble(lowB, upB); } - ///////////// Trivials... - @Override - public void setIdentifier(String name) { - identifier = name; - } @Override public InterfaceOptimizationProblem getProblem() { @@ -712,11 +707,6 @@ public class ScatterSearch implements InterfaceOptimizer, java.io.Serializable, } } - @Override - public String getIdentifier() { - return identifier; - } - @Override public String getName() { return "ScatterSearch"; diff --git a/src/eva2/optimization/strategies/SimulatedAnnealing.java b/src/eva2/optimization/strategies/SimulatedAnnealing.java index 177feb91..a11dd2af 100644 --- a/src/eva2/optimization/strategies/SimulatedAnnealing.java +++ b/src/eva2/optimization/strategies/SimulatedAnnealing.java @@ -233,21 +233,6 @@ public class SimulatedAnnealing implements InterfaceOptimizer, java.io.Serializa return result; } - /** - * This method allows you to set an identifier for the algorithm - * - * @param name The indenifier - */ - @Override - public void setIdentifier(String name) { - this.identifier = name; - } - - @Override - public String getIdentifier() { - return this.identifier; - } - /** * This method will return a naming String diff --git a/src/eva2/optimization/strategies/SteadyStateGA.java b/src/eva2/optimization/strategies/SteadyStateGA.java index e7fbb984..52f947ca 100644 --- a/src/eva2/optimization/strategies/SteadyStateGA.java +++ b/src/eva2/optimization/strategies/SteadyStateGA.java @@ -176,21 +176,6 @@ public class SteadyStateGA implements InterfaceOptimizer, java.io.Serializable { return result; } - /** - * This method allows you to set an identifier for the algorithm - * - * @param name The indenifier - */ - @Override - public void setIdentifier(String name) { - this.identifier = name; - } - - @Override - public String getIdentifier() { - return this.identifier; - } - /** * This method will return a naming String * diff --git a/src/eva2/optimization/strategies/ThresholdAlgorithm.java b/src/eva2/optimization/strategies/ThresholdAlgorithm.java index 599b11d4..059799dd 100644 --- a/src/eva2/optimization/strategies/ThresholdAlgorithm.java +++ b/src/eva2/optimization/strategies/ThresholdAlgorithm.java @@ -224,21 +224,6 @@ public class ThresholdAlgorithm implements InterfaceOptimizer, java.io.Serializa return result; } - /** - * This method allows you to set an identifier for the algorithm - * - * @param name The indenifier - */ - @Override - public void setIdentifier(String name) { - this.indentifier = name; - } - - @Override - public String getIdentifier() { - return this.indentifier; - } - /** * This method will return a naming String * diff --git a/src/eva2/optimization/strategies/Tribes.java b/src/eva2/optimization/strategies/Tribes.java index 4f0f5049..0c8b97c7 100644 --- a/src/eva2/optimization/strategies/Tribes.java +++ b/src/eva2/optimization/strategies/Tribes.java @@ -637,16 +637,6 @@ public class Tribes implements InterfaceOptimizer, java.io.Serializable { return (evals % notifyGenChangedEvery) == 0; } - @Override - public void setIdentifier(String name) { - this.identifier = name; - } - - @Override - public String getIdentifier() { - return identifier; - } - @Override public String getName() { return "TRIBES"; diff --git a/src/eva2/optimization/strategies/WingedMultiObjectiveEA.java b/src/eva2/optimization/strategies/WingedMultiObjectiveEA.java index 2edf4d32..0ff48630 100644 --- a/src/eva2/optimization/strategies/WingedMultiObjectiveEA.java +++ b/src/eva2/optimization/strategies/WingedMultiObjectiveEA.java @@ -269,21 +269,6 @@ public class WingedMultiObjectiveEA implements InterfaceOptimizer, java.io.Seria return result; } - /** - * This method allows you to set an identifier for the algorithm - * - * @param name The indenifier - */ - @Override - public void setIdentifier(String name) { - this.identifier = name; - } - - @Override - public String getIdentifier() { - return this.identifier; - } - /** * This method will return a naming String *