From 8104c9baf7298c52fb6726ae5716c354d11a0000 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Sun, 2 Nov 2014 14:53:27 +0100 Subject: [PATCH] Rename more init() methods to initialize() --- .../operator/crossover/TestESCrossover.java | 2 +- .../population/PBILPopulation.java | 2 +- .../optimization/population/Population.java | 20 ++++++------------- .../AdaptiveDifferentialEvolution.java | 2 +- .../strategies/ArtificialBeeColony.java | 2 +- .../CHCAdaptiveSearchAlgorithm.java | 2 +- .../strategies/ClusterBasedNichingEA.java | 2 +- .../strategies/ClusteringHillClimbing.java | 2 +- .../strategies/DifferentialEvolution.java | 2 +- .../optimization/strategies/EsDpiNiching.java | 2 +- .../strategies/EvolutionStrategies.java | 2 +- .../strategies/EvolutionaryProgramming.java | 2 +- .../strategies/FloodAlgorithm.java | 2 +- .../strategies/GeneticAlgorithm.java | 2 +- .../strategies/GradientDescentAlgorithm.java | 2 +- .../optimization/strategies/HillClimbing.java | 2 +- .../strategies/IslandModelEA.java | 4 ++-- .../strategies/MemeticAlgorithm.java | 2 +- .../strategies/MonteCarloSearch.java | 2 +- .../ParticleFilterOptimization.java | 2 +- .../ParticleSubSwarmOptimization.java | 2 +- .../strategies/ParticleSwarmOptimization.java | 2 +- .../PopulationBasedIncrementalLearning.java | 2 +- .../strategies/ScatterSearch.java | 2 +- .../strategies/SimulatedAnnealing.java | 2 +- .../strategies/SteadyStateGA.java | 2 +- .../strategies/ThresholdAlgorithm.java | 2 +- src/eva2/optimization/strategies/Tribes.java | 2 +- .../AbstractMultiModalProblemKnown.java | 2 +- .../problems/AbstractOptimizationProblem.java | 2 +- src/eva2/problems/AbstractProblemDouble.java | 16 +++++++-------- 31 files changed, 44 insertions(+), 52 deletions(-) diff --git a/src/eva2/optimization/operator/crossover/TestESCrossover.java b/src/eva2/optimization/operator/crossover/TestESCrossover.java index 65adef3a..198c3e4b 100644 --- a/src/eva2/optimization/operator/crossover/TestESCrossover.java +++ b/src/eva2/optimization/operator/crossover/TestESCrossover.java @@ -113,7 +113,7 @@ public class TestESCrossover implements java.io.Serializable { tmpIndyEA.initialize(optimizationProblem); partners.add(tmpIndyEA); } - partners.init(); + partners.initialize(); daddy = (AbstractEAIndividual) ((AbstractEAIndividual) tmpIndyD).clone(); daddy.initialize(optimizationProblem); plot.clearAll(); diff --git a/src/eva2/optimization/population/PBILPopulation.java b/src/eva2/optimization/population/PBILPopulation.java index 60ad2522..486aa5b4 100644 --- a/src/eva2/optimization/population/PBILPopulation.java +++ b/src/eva2/optimization/population/PBILPopulation.java @@ -40,7 +40,7 @@ public class PBILPopulation extends Population implements Cloneable, java.io.Ser * have been inited by a problem. */ @Override - public void init() { + public void initialize() { this.generationCount = 0; this.functionCallCount = 0; if (!(this.get(0) instanceof InterfaceGAIndividual)) { diff --git a/src/eva2/optimization/population/Population.java b/src/eva2/optimization/population/Population.java index 97462e20..66b4f94d 100644 --- a/src/eva2/optimization/population/Population.java +++ b/src/eva2/optimization/population/Population.java @@ -363,19 +363,17 @@ public class Population extends ArrayList implements PopulationInterface, Clonea } /** - * This method inits the state of the population AFTER the individuals have - * been inited by a problem + * This method initializes the state of the population AFTER the individuals have + * been initialized by a problem */ - public void init() { + public void initialize() { this.historyList = new LinkedList<>(); this.generationCount = 0; this.functionCallCount = 0; double[] popSeed = null; -// evaluationTimeHashes = null; -// evaluationTimeModCount = -1; if (this.populationArchive != null) { this.populationArchive.clear(); - this.populationArchive.init(); + this.populationArchive.initialize(); } switch (initMethod) { case individualDefault: @@ -433,14 +431,12 @@ public class Population extends ArrayList implements PopulationInterface, Clonea return seedPos; } + @Parameter(description = "Position around which the population will be (randomly) initialized. Be aware that the vector length must match (or exceed) problem dimension!") public void setInitPos(double[] si) { seedPos = si; } - public String initPosTipText() { - return "Position around which the population will be (randomly) initialized. Be aware that the vector length must match (or exceed) problem dimension!"; - } - + @Parameter(description = "Length of hypercube within which individuals are initialized around the initial position.") public void setInitAround(double d) { aroundDist = d; } @@ -449,10 +445,6 @@ public class Population extends ArrayList implements PopulationInterface, Clonea return aroundDist; } - public String initAroundTipText() { - return "Lenght of hypercube within which individuals are initialized around the initial position."; - } - /** * This method inits the population. Function and generation counters are * reset and size default Individuals are created and initialized by the diff --git a/src/eva2/optimization/strategies/AdaptiveDifferentialEvolution.java b/src/eva2/optimization/strategies/AdaptiveDifferentialEvolution.java index 945d2ca1..837ea6fc 100644 --- a/src/eva2/optimization/strategies/AdaptiveDifferentialEvolution.java +++ b/src/eva2/optimization/strategies/AdaptiveDifferentialEvolution.java @@ -65,7 +65,7 @@ public class AdaptiveDifferentialEvolution extends AbstractOptimizer { public void initializeByPopulation(Population pop, boolean reset) { this.population = (Population) pop.clone(); if (reset) { - this.population.init(); + this.population.initialize(); this.evaluatePopulation(this.population); this.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED); } diff --git a/src/eva2/optimization/strategies/ArtificialBeeColony.java b/src/eva2/optimization/strategies/ArtificialBeeColony.java index beacd1d5..e4b12128 100644 --- a/src/eva2/optimization/strategies/ArtificialBeeColony.java +++ b/src/eva2/optimization/strategies/ArtificialBeeColony.java @@ -64,7 +64,7 @@ public class ArtificialBeeColony extends AbstractOptimizer implements Serializab public void initializeByPopulation(Population pop, boolean reset) { this.population = (Population) pop.clone(); if (reset) { - this.population.init(); + this.population.initialize(); this.evaluatePopulation(this.population); this.bestIndividual = this.population.getBestEAIndividual(); this.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED); diff --git a/src/eva2/optimization/strategies/CHCAdaptiveSearchAlgorithm.java b/src/eva2/optimization/strategies/CHCAdaptiveSearchAlgorithm.java index 14eb4033..4f8772b0 100644 --- a/src/eva2/optimization/strategies/CHCAdaptiveSearchAlgorithm.java +++ b/src/eva2/optimization/strategies/CHCAdaptiveSearchAlgorithm.java @@ -78,7 +78,7 @@ public class CHCAdaptiveSearchAlgorithm extends AbstractOptimizer implements jav public void initializeByPopulation(Population pop, boolean reset) { this.population = (Population) pop.clone(); if (reset) { - this.population.init(); + this.population.initialize(); } AbstractEAIndividual tmpIndy = ((AbstractEAIndividual) (this.population.get(0))); if (tmpIndy instanceof InterfaceGAIndividual) { diff --git a/src/eva2/optimization/strategies/ClusterBasedNichingEA.java b/src/eva2/optimization/strategies/ClusterBasedNichingEA.java index d09e19cf..54b503bf 100644 --- a/src/eva2/optimization/strategies/ClusterBasedNichingEA.java +++ b/src/eva2/optimization/strategies/ClusterBasedNichingEA.java @@ -216,7 +216,7 @@ public class ClusterBasedNichingEA extends AbstractOptimizer implements Interfac public void initializeByPopulation(Population pop, boolean reset) { this.undifferentiatedPopulation = (Population) pop.clone(); if (reset) { - this.undifferentiatedPopulation.init(); + this.undifferentiatedPopulation.initialize(); } initDefaults(reset); } diff --git a/src/eva2/optimization/strategies/ClusteringHillClimbing.java b/src/eva2/optimization/strategies/ClusteringHillClimbing.java index e1123b2a..869abbac 100644 --- a/src/eva2/optimization/strategies/ClusteringHillClimbing.java +++ b/src/eva2/optimization/strategies/ClusteringHillClimbing.java @@ -114,7 +114,7 @@ public class ClusteringHillClimbing extends AbstractOptimizer implements Interfa this.population = (Population) pop.clone(); population.addPopulationChangedEventListener(null); if (reset) { - this.population.init(); + this.population.initialize(); this.optimizationProblem.evaluate(this.population); this.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED); } diff --git a/src/eva2/optimization/strategies/DifferentialEvolution.java b/src/eva2/optimization/strategies/DifferentialEvolution.java index b577b6c7..c47ee987 100644 --- a/src/eva2/optimization/strategies/DifferentialEvolution.java +++ b/src/eva2/optimization/strategies/DifferentialEvolution.java @@ -117,7 +117,7 @@ public class DifferentialEvolution extends AbstractOptimizer implements java.io. public void initializeByPopulation(Population pop, boolean reset) { this.population = (Population) pop.clone(); if (reset) { - this.population.init(); + this.population.initialize(); this.evaluatePopulation(this.population); this.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED); } diff --git a/src/eva2/optimization/strategies/EsDpiNiching.java b/src/eva2/optimization/strategies/EsDpiNiching.java index 51448af9..344b1595 100644 --- a/src/eva2/optimization/strategies/EsDpiNiching.java +++ b/src/eva2/optimization/strategies/EsDpiNiching.java @@ -908,7 +908,7 @@ public class EsDpiNiching extends AbstractOptimizer implements Serializable, Int public void initializeByPopulation(Population pop, boolean reset) { this.population = (Population) pop.clone(); if (reset) { - this.population.init(); + this.population.initialize(); this.optimizationProblem.evaluate(population); population.incrGeneration(); } diff --git a/src/eva2/optimization/strategies/EvolutionStrategies.java b/src/eva2/optimization/strategies/EvolutionStrategies.java index cec8e17f..16a96c8b 100644 --- a/src/eva2/optimization/strategies/EvolutionStrategies.java +++ b/src/eva2/optimization/strategies/EvolutionStrategies.java @@ -101,7 +101,7 @@ public class EvolutionStrategies extends AbstractOptimizer implements java.io.Se origPopSize = pop.getTargetSize(); this.population = (Population) pop.clone(); if (reset) { - this.population.init(); + this.population.initialize(); this.evaluatePopulation(this.population); } } diff --git a/src/eva2/optimization/strategies/EvolutionaryProgramming.java b/src/eva2/optimization/strategies/EvolutionaryProgramming.java index a25134b3..d002d80a 100644 --- a/src/eva2/optimization/strategies/EvolutionaryProgramming.java +++ b/src/eva2/optimization/strategies/EvolutionaryProgramming.java @@ -59,7 +59,7 @@ public class EvolutionaryProgramming extends AbstractOptimizer implements java.i public void initializeByPopulation(Population pop, boolean reset) { this.population = (Population) pop.clone(); if (reset) { - this.population.init(); + this.population.initialize(); this.evaluatePopulation(this.population); this.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED); } diff --git a/src/eva2/optimization/strategies/FloodAlgorithm.java b/src/eva2/optimization/strategies/FloodAlgorithm.java index dbfe5784..0641626d 100644 --- a/src/eva2/optimization/strategies/FloodAlgorithm.java +++ b/src/eva2/optimization/strategies/FloodAlgorithm.java @@ -65,7 +65,7 @@ public class FloodAlgorithm extends AbstractOptimizer implements java.io.Seriali public void initializeByPopulation(Population pop, boolean reset) { this.population = (Population) pop.clone(); if (reset) { - this.population.init(); + this.population.initialize(); this.optimizationProblem.evaluate(this.population); this.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED); } diff --git a/src/eva2/optimization/strategies/GeneticAlgorithm.java b/src/eva2/optimization/strategies/GeneticAlgorithm.java index 70bdd49a..5b971eca 100644 --- a/src/eva2/optimization/strategies/GeneticAlgorithm.java +++ b/src/eva2/optimization/strategies/GeneticAlgorithm.java @@ -61,7 +61,7 @@ public class GeneticAlgorithm extends AbstractOptimizer implements java.io.Seria this.population = (Population) pop.clone(); if (reset) { this.optimizationProblem.initializePopulation(population); - this.population.init(); + this.population.initialize(); this.evaluatePopulation(this.population); this.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED); } diff --git a/src/eva2/optimization/strategies/GradientDescentAlgorithm.java b/src/eva2/optimization/strategies/GradientDescentAlgorithm.java index 6b6865f8..dfb81137 100644 --- a/src/eva2/optimization/strategies/GradientDescentAlgorithm.java +++ b/src/eva2/optimization/strategies/GradientDescentAlgorithm.java @@ -52,7 +52,7 @@ public class GradientDescentAlgorithm extends AbstractOptimizer implements java. public void initializeByPopulation(Population pop, boolean reset) { this.setPopulation((Population) pop.clone()); if (reset) { - this.getPopulation().init(); + this.getPopulation().initialize(); this.optimizationProblem.evaluate(this.getPopulation()); this.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED); } diff --git a/src/eva2/optimization/strategies/HillClimbing.java b/src/eva2/optimization/strategies/HillClimbing.java index 2276ec1f..2c8e91f5 100644 --- a/src/eva2/optimization/strategies/HillClimbing.java +++ b/src/eva2/optimization/strategies/HillClimbing.java @@ -50,7 +50,7 @@ public class HillClimbing extends AbstractOptimizer implements java.io.Serializa public void initializeByPopulation(Population pop, boolean reset) { this.population = (Population) pop.clone(); if (reset) { - this.population.init(); + this.population.initialize(); this.optimizationProblem.evaluate(this.population); this.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED); } diff --git a/src/eva2/optimization/strategies/IslandModelEA.java b/src/eva2/optimization/strategies/IslandModelEA.java index b4d6276a..71ef30e0 100644 --- a/src/eva2/optimization/strategies/IslandModelEA.java +++ b/src/eva2/optimization/strategies/IslandModelEA.java @@ -83,7 +83,7 @@ public class IslandModelEA implements InterfacePopulationChangedEventListener, I // this.population = new Population(); this.population.clear(); - this.population.init(); + this.population.initialize(); this.optimizer.initialize(); this.optimizer.setProblem(this.optimizationProblem); this.optimizer.setPopulation((Population) population.clone()); @@ -151,7 +151,7 @@ public class IslandModelEA implements InterfacePopulationChangedEventListener, I this.population = (Population) tpop.clone(); if (reset) { - this.population.init(); + this.population.initialize(); this.population.incrGeneration(); } this.optimizer.initialize(); diff --git a/src/eva2/optimization/strategies/MemeticAlgorithm.java b/src/eva2/optimization/strategies/MemeticAlgorithm.java index ab65126c..8937722d 100644 --- a/src/eva2/optimization/strategies/MemeticAlgorithm.java +++ b/src/eva2/optimization/strategies/MemeticAlgorithm.java @@ -64,7 +64,7 @@ public class MemeticAlgorithm implements InterfaceOptimizer, java.io.Serializabl public void initializeByPopulation(Population pop, boolean reset) { this.setPopulation((Population) pop.clone()); if (reset) { - this.getPopulation().init(); + this.getPopulation().initialize(); this.optimizationProblem.evaluate(this.getPopulation()); this.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED); } diff --git a/src/eva2/optimization/strategies/MonteCarloSearch.java b/src/eva2/optimization/strategies/MonteCarloSearch.java index f9c50225..3f2368e1 100644 --- a/src/eva2/optimization/strategies/MonteCarloSearch.java +++ b/src/eva2/optimization/strategies/MonteCarloSearch.java @@ -57,7 +57,7 @@ public class MonteCarloSearch extends AbstractOptimizer implements java.io.Seria public void initializeByPopulation(Population pop, boolean reset) { this.population = (Population) pop.clone(); if (reset) { - this.population.init(); + this.population.initialize(); this.optimizationProblem.evaluate(this.population); this.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED); } diff --git a/src/eva2/optimization/strategies/ParticleFilterOptimization.java b/src/eva2/optimization/strategies/ParticleFilterOptimization.java index e780edf9..bb27222c 100644 --- a/src/eva2/optimization/strategies/ParticleFilterOptimization.java +++ b/src/eva2/optimization/strategies/ParticleFilterOptimization.java @@ -97,7 +97,7 @@ public class ParticleFilterOptimization extends AbstractOptimizer implements jav public void initializeByPopulation(Population pop, boolean reset) { this.population = (Population) pop.clone(); if (reset) { - this.population.init(); + this.population.initialize(); this.evaluatePopulation(this.population); this.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED); } diff --git a/src/eva2/optimization/strategies/ParticleSubSwarmOptimization.java b/src/eva2/optimization/strategies/ParticleSubSwarmOptimization.java index 2f7183c0..b719175b 100644 --- a/src/eva2/optimization/strategies/ParticleSubSwarmOptimization.java +++ b/src/eva2/optimization/strategies/ParticleSubSwarmOptimization.java @@ -484,7 +484,7 @@ public class ParticleSubSwarmOptimization extends ParticleSwarmOptimizationGCPSO tmpIndy.initialize(prob); tmp.add(tmpIndy); } - tmp.init(); + tmp.initialize(); /////////// ParticleSubSwarmOptimization tmpopt = new ParticleSubSwarmOptimization(); diff --git a/src/eva2/optimization/strategies/ParticleSwarmOptimization.java b/src/eva2/optimization/strategies/ParticleSwarmOptimization.java index 46e09540..cbdcf2ae 100644 --- a/src/eva2/optimization/strategies/ParticleSwarmOptimization.java +++ b/src/eva2/optimization/strategies/ParticleSwarmOptimization.java @@ -424,7 +424,7 @@ public class ParticleSwarmOptimization extends AbstractOptimizer implements java externalInitialPop = true; } if (reset) { - this.population.init(); + this.population.initialize(); } AbstractEAIndividual indy; diff --git a/src/eva2/optimization/strategies/PopulationBasedIncrementalLearning.java b/src/eva2/optimization/strategies/PopulationBasedIncrementalLearning.java index 2127c108..e90b268c 100644 --- a/src/eva2/optimization/strategies/PopulationBasedIncrementalLearning.java +++ b/src/eva2/optimization/strategies/PopulationBasedIncrementalLearning.java @@ -91,7 +91,7 @@ public class PopulationBasedIncrementalLearning extends AbstractOptimizer implem this.population = new PBILPopulation(); this.population.addPopulation((Population) pop.clone()); if (reset) { - this.population.init(); + this.population.initialize(); this.evaluatePopulation(this.population); } ((PBILPopulation) this.population).buildProbabilityVector(); diff --git a/src/eva2/optimization/strategies/ScatterSearch.java b/src/eva2/optimization/strategies/ScatterSearch.java index 5c619453..d699eeb0 100644 --- a/src/eva2/optimization/strategies/ScatterSearch.java +++ b/src/eva2/optimization/strategies/ScatterSearch.java @@ -844,7 +844,7 @@ public class ScatterSearch implements InterfaceOptimizer, java.io.Serializable, } Population pop = new Population(); pop.setTargetSize(refSetSize); - pop.init(); + pop.initialize(); problem.initializePopulation(pop); ss.initializeByPopulation(pop, true); diff --git a/src/eva2/optimization/strategies/SimulatedAnnealing.java b/src/eva2/optimization/strategies/SimulatedAnnealing.java index e79fd726..d43a87fd 100644 --- a/src/eva2/optimization/strategies/SimulatedAnnealing.java +++ b/src/eva2/optimization/strategies/SimulatedAnnealing.java @@ -64,7 +64,7 @@ public class SimulatedAnnealing extends AbstractOptimizer implements java.io.Ser this.population = (Population) pop.clone(); this.currentTemperature = this.initialTemperature; if (reset) { - this.population.init(); + this.population.initialize(); this.optimizationProblem.evaluate(this.population); this.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED); } diff --git a/src/eva2/optimization/strategies/SteadyStateGA.java b/src/eva2/optimization/strategies/SteadyStateGA.java index e8530bc5..f840f520 100644 --- a/src/eva2/optimization/strategies/SteadyStateGA.java +++ b/src/eva2/optimization/strategies/SteadyStateGA.java @@ -60,7 +60,7 @@ public class SteadyStateGA extends AbstractOptimizer implements java.io.Serializ public void initializeByPopulation(Population pop, boolean reset) { this.population = (Population) pop.clone(); if (reset) { - this.population.init(); + this.population.initialize(); this.evaluatePopulation(this.population); this.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED); } diff --git a/src/eva2/optimization/strategies/ThresholdAlgorithm.java b/src/eva2/optimization/strategies/ThresholdAlgorithm.java index 95a994a4..dd4c0123 100644 --- a/src/eva2/optimization/strategies/ThresholdAlgorithm.java +++ b/src/eva2/optimization/strategies/ThresholdAlgorithm.java @@ -61,7 +61,7 @@ public class ThresholdAlgorithm extends AbstractOptimizer implements java.io.Ser this.population = (Population) pop.clone(); this.currentT = this.initialT; if (reset) { - this.population.init(); + this.population.initialize(); this.optimizationProblem.evaluate(this.population); this.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED); } diff --git a/src/eva2/optimization/strategies/Tribes.java b/src/eva2/optimization/strategies/Tribes.java index 31729405..2b2af3ea 100644 --- a/src/eva2/optimization/strategies/Tribes.java +++ b/src/eva2/optimization/strategies/Tribes.java @@ -229,7 +229,7 @@ public class Tribes implements InterfaceOptimizer, java.io.Serializable { population.clear(); population.addAll(swarm.toPopulation()); - population.init(); // necessary to allow for multi-runs + population.initialize(); // necessary to allow for multi-runs if (show) { show(); diff --git a/src/eva2/problems/AbstractMultiModalProblemKnown.java b/src/eva2/problems/AbstractMultiModalProblemKnown.java index 26b092f8..980da93d 100644 --- a/src/eva2/problems/AbstractMultiModalProblemKnown.java +++ b/src/eva2/problems/AbstractMultiModalProblemKnown.java @@ -62,7 +62,7 @@ public abstract class AbstractMultiModalProblemKnown extends AbstractProblemDoub } // population initialize must be last // it set's fitcalls and generation to zero - population.init(); + population.initialize(); if (listOfOptima == null) { this.globalOptimum = Double.NEGATIVE_INFINITY; listOfOptima = new Population(); diff --git a/src/eva2/problems/AbstractOptimizationProblem.java b/src/eva2/problems/AbstractOptimizationProblem.java index bf1052d6..f80f649b 100644 --- a/src/eva2/problems/AbstractOptimizationProblem.java +++ b/src/eva2/problems/AbstractOptimizationProblem.java @@ -194,7 +194,7 @@ public abstract class AbstractOptimizationProblem implements InterfaceOptimizati } // population initialize must be last // it set's fitcalls and generation to zero - population.init(); + population.initialize(); } /** diff --git a/src/eva2/problems/AbstractProblemDouble.java b/src/eva2/problems/AbstractProblemDouble.java index 6bca47d6..1962b064 100644 --- a/src/eva2/problems/AbstractProblemDouble.java +++ b/src/eva2/problems/AbstractProblemDouble.java @@ -62,14 +62,14 @@ public abstract class AbstractProblemDouble extends AbstractOptimizationProblem public static String rawFitKey = "UnconstrainedFitnessValue"; public AbstractProblemDouble() { - initTemplate(); + initializeTemplate(); } public AbstractProblemDouble(AbstractProblemDouble o) { cloneObjects(o); } - protected void initTemplate() { + protected void initializeTemplate() { if (template == null) { template = new ESIndividualDoubleData(); } @@ -174,9 +174,9 @@ public abstract class AbstractProblemDouble extends AbstractOptimizationProblem * @param indyPos may contain the decoded individual position */ protected void addConstraints(AbstractEAIndividual individual, double[] indyPos) { - AbstractConstraint[] contraints = getConstraints(); - for (AbstractConstraint contraint : contraints) { - contraint.addViolation(individual, indyPos); + AbstractConstraint[] constraints = getConstraints(); + for (AbstractConstraint constraint : constraints) { + constraint.addViolation(individual, indyPos); } } @@ -205,7 +205,7 @@ public abstract class AbstractProblemDouble extends AbstractOptimizationProblem @Override public void initializePopulation(Population population) { - initTemplate(); + initializeTemplate(); AbstractOptimizationProblem.defaultInitializePopulation(population, template, this); } @@ -257,7 +257,7 @@ public abstract class AbstractProblemDouble extends AbstractOptimizationProblem @Override public void initializeProblem() { - initTemplate(); + initializeTemplate(); if (isDoRotation()) { rotation = initializeDefaultRotationMatrix(rotAngle, getProblemDimension()); } else { @@ -339,7 +339,7 @@ public abstract class AbstractProblemDouble extends AbstractOptimizationProblem */ public void setDefaultRange(double defaultRange) { this.defaultRange = defaultRange; - initTemplate(); + initializeTemplate(); } public String defaultRangeTipText() {