From 3ac628e85f0c9de541587db01a09d9583efd205c Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Fri, 31 Oct 2014 15:21:13 +0100 Subject: [PATCH] Rename init method to initialize and fix a bug for SBMLsimulator interop --- src/eva2/gui/Main.java | 7 ++++++- .../individuals/AbstractEAIndividual.java | 4 ++-- .../individuals/ESIndividualBinaryData.java | 2 +- .../individuals/ESIndividualDoubleData.java | 2 +- .../individuals/ESIndividualIntegerData.java | 2 +- .../individuals/ESIndividualPermutationData.java | 2 +- .../individuals/GAIndividualBinaryData.java | 2 +- .../individuals/GAIndividualDoubleData.java | 2 +- .../individuals/GAIndividualIntegerData.java | 2 +- .../individuals/GEIndividualProgramData.java | 2 +- .../individuals/GIIndividualIntegerData.java | 2 +- .../individuals/GPIndividualProgramData.java | 2 +- .../individuals/OBGAIndividualPermutationData.java | 2 +- .../operator/mutation/InterfaceMutation.java | 2 +- .../operator/mutation/MutateDefault.java | 2 +- .../operator/mutation/MutateEAMixer.java | 4 ++-- .../operator/mutation/MutateESCorrVector.java | 2 +- ...teESCorrolated.java => MutateESCorrelated.java} | 14 +++++++------- .../mutation/MutateESCovarianceMatrixAdaption.java | 2 +- .../MutateESCovarianceMatrixAdaptionPlus.java | 6 +++--- .../operator/mutation/MutateESFixedStepSize.java | 2 +- .../operator/mutation/MutateESGlobal.java | 2 +- .../operator/mutation/MutateESLocal.java | 2 +- .../mutation/MutateESMainVectorAdaption.java | 2 +- .../mutation/MutateESMutativeStepSizeControl.java | 2 +- .../mutation/MutateESPathLengthAdaption.java | 2 +- .../operator/mutation/MutateESPolynomial.java | 2 +- .../operator/mutation/MutateESRankMuCMA.java | 4 ++-- .../operator/mutation/MutateGAAdaptive.java | 2 +- .../operator/mutation/MutateGAGISwapBits.java | 2 +- .../operator/mutation/MutateGAInvertBits.java | 2 +- .../operator/mutation/MutateGANBit.java | 2 +- .../operator/mutation/MutateGAShiftSubstring.java | 2 +- .../mutation/MutateGASwapBitsSegmentwise.java | 2 +- .../operator/mutation/MutateGAUniform.java | 4 ++-- .../operator/mutation/MutateGIInsertDelete.java | 2 +- .../operator/mutation/MutateGIInvert.java | 2 +- .../operator/mutation/MutateGINominal.java | 2 +- .../operator/mutation/MutateGIOrdinal.java | 2 +- .../operator/mutation/MutateGISubset.java | 4 ++-- .../operator/mutation/MutateGITranslocate.java | 2 +- .../operator/mutation/MutateGPAdaptive.java | 2 +- .../operator/mutation/MutateGPSingleNode.java | 2 +- .../operator/mutation/MutateOBGAFlip.java | 2 +- .../operator/mutation/MutateOBGAInversion.java | 2 +- .../optimization/operator/mutation/NoMutation.java | 2 +- .../operator/postprocess/PostProcess.java | 2 +- 47 files changed, 65 insertions(+), 60 deletions(-) rename src/eva2/optimization/operator/mutation/{MutateESCorrolated.java => MutateESCorrelated.java} (95%) diff --git a/src/eva2/gui/Main.java b/src/eva2/gui/Main.java index 00e1be66..ddca4331 100644 --- a/src/eva2/gui/Main.java +++ b/src/eva2/gui/Main.java @@ -2,6 +2,7 @@ package eva2.gui; import eva2.EvAInfo; import eva2.optimization.modules.*; +import eva2.problems.InterfaceOptimizationProblem; import eva2.util.ClassPreloader; import eva2.util.EvAComAdapter; import eva2.optimization.OptimizationStateListener; @@ -775,7 +776,11 @@ public class Main extends JFrame implements OptimizationStateListener { ModuleAdapter newModuleAdapter = null; // try { - newModuleAdapter = new GOModuleAdapter(selectedModule, OptimizationParameters.getInstance(), withGUI ? null : "EvA2"); + InterfaceOptimizationParameters params = optimizationParameters; + if (optimizationParameters == null) { + params = OptimizationParameters.getInstance(); + } + newModuleAdapter = new GOModuleAdapter(selectedModule, params, withGUI ? null : "EvA2"); //newModuleAdapter = comAdapter.getModuleAdapter(selectedModule, optimizationParameters, withGUI ? null : "EvA2"); } catch (Exception e) { LOGGER.log(Level.SEVERE, "Error loading module.", e); diff --git a/src/eva2/optimization/individuals/AbstractEAIndividual.java b/src/eva2/optimization/individuals/AbstractEAIndividual.java index 102505f4..b7ad9005 100644 --- a/src/eva2/optimization/individuals/AbstractEAIndividual.java +++ b/src/eva2/optimization/individuals/AbstractEAIndividual.java @@ -120,7 +120,7 @@ public abstract class AbstractEAIndividual implements IndividualInterface, java. public void initCloneOperators(InterfaceMutation mutOp, double pMut, InterfaceCrossover coOp, double pCross, InterfaceOptimizationProblem problem) { mutationProbability = pMut; mutationOperator = (InterfaceMutation) mutOp.clone(); - mutationOperator.init(this, problem); + mutationOperator.initialize(this, problem); crossoverProbability = pCross; crossoverOperator = (InterfaceCrossover) coOp.clone(); crossoverOperator.init(this, problem); @@ -277,7 +277,7 @@ public abstract class AbstractEAIndividual implements IndividualInterface, java. */ public void init(InterfaceOptimizationProblem opt) { initializationOperator.initialize(this, opt); - this.mutationOperator.init(this, opt); + this.mutationOperator.initialize(this, opt); this.crossoverOperator.init(this, opt); } diff --git a/src/eva2/optimization/individuals/ESIndividualBinaryData.java b/src/eva2/optimization/individuals/ESIndividualBinaryData.java index a3ffb1ca..e489e5e9 100644 --- a/src/eva2/optimization/individuals/ESIndividualBinaryData.java +++ b/src/eva2/optimization/individuals/ESIndividualBinaryData.java @@ -217,7 +217,7 @@ public class ESIndividualBinaryData extends AbstractEAIndividual implements Inte this.defaultInit(opt); System.out.println("Initial value for ESIndividualBinaryData is no BitSet!"); } - this.mutationOperator.init(this, opt); + this.mutationOperator.initialize(this, opt); this.crossoverOperator.init(this, opt); } diff --git a/src/eva2/optimization/individuals/ESIndividualDoubleData.java b/src/eva2/optimization/individuals/ESIndividualDoubleData.java index 26f9f7fc..ae8dd218 100644 --- a/src/eva2/optimization/individuals/ESIndividualDoubleData.java +++ b/src/eva2/optimization/individuals/ESIndividualDoubleData.java @@ -271,7 +271,7 @@ public class ESIndividualDoubleData extends AbstractEAIndividual implements Inte this.defaultInit(opt); System.out.println("Initial value for ESIndividualDoubleData is not double[]!"); } - this.mutationOperator.init(this, opt); + this.mutationOperator.initialize(this, opt); this.crossoverOperator.init(this, opt); } diff --git a/src/eva2/optimization/individuals/ESIndividualIntegerData.java b/src/eva2/optimization/individuals/ESIndividualIntegerData.java index f6eaf499..8a9b641a 100644 --- a/src/eva2/optimization/individuals/ESIndividualIntegerData.java +++ b/src/eva2/optimization/individuals/ESIndividualIntegerData.java @@ -240,7 +240,7 @@ public class ESIndividualIntegerData extends AbstractEAIndividual implements Int this.defaultInit(opt); System.out.println("Initial value for ESIndividualIntegerData is not int[]!"); } - this.mutationOperator.init(this, opt); + this.mutationOperator.initialize(this, opt); this.crossoverOperator.init(this, opt); } diff --git a/src/eva2/optimization/individuals/ESIndividualPermutationData.java b/src/eva2/optimization/individuals/ESIndividualPermutationData.java index 0d53db3f..0e1ca54f 100644 --- a/src/eva2/optimization/individuals/ESIndividualPermutationData.java +++ b/src/eva2/optimization/individuals/ESIndividualPermutationData.java @@ -260,7 +260,7 @@ public class ESIndividualPermutationData extends AbstractEAIndividual implements this.defaultInit(opt); System.out.println("Initial value for ESIndividualPermutationData is not int[]!"); } - this.mutationOperator.init(this, opt); + this.mutationOperator.initialize(this, opt); this.crossoverOperator.init(this, opt); } diff --git a/src/eva2/optimization/individuals/GAIndividualBinaryData.java b/src/eva2/optimization/individuals/GAIndividualBinaryData.java index 1b5ab46c..aba42880 100644 --- a/src/eva2/optimization/individuals/GAIndividualBinaryData.java +++ b/src/eva2/optimization/individuals/GAIndividualBinaryData.java @@ -122,7 +122,7 @@ public class GAIndividualBinaryData extends AbstractEAIndividual implements Inte this.defaultInit(opt); System.out.println("Initial value for GAIndividualBinaryData is no BitSet!"); } - this.mutationOperator.init(this, opt); + this.mutationOperator.initialize(this, opt); this.crossoverOperator.init(this, opt); } diff --git a/src/eva2/optimization/individuals/GAIndividualDoubleData.java b/src/eva2/optimization/individuals/GAIndividualDoubleData.java index 4f9c6fca..3b3215cc 100644 --- a/src/eva2/optimization/individuals/GAIndividualDoubleData.java +++ b/src/eva2/optimization/individuals/GAIndividualDoubleData.java @@ -252,7 +252,7 @@ public class GAIndividualDoubleData extends AbstractEAIndividual implements Inte this.defaultInit(opt); System.out.println("Initial value for GAIndividualDoubleData is not double[]!"); } - this.mutationOperator.init(this, opt); + this.mutationOperator.initialize(this, opt); this.crossoverOperator.init(this, opt); } diff --git a/src/eva2/optimization/individuals/GAIndividualIntegerData.java b/src/eva2/optimization/individuals/GAIndividualIntegerData.java index e323fe6a..8578db1c 100644 --- a/src/eva2/optimization/individuals/GAIndividualIntegerData.java +++ b/src/eva2/optimization/individuals/GAIndividualIntegerData.java @@ -286,7 +286,7 @@ public class GAIndividualIntegerData extends AbstractEAIndividual implements Int this.defaultInit(opt); System.out.println("Initial value for GAIndividualDoubleData is not double[]!"); } - this.mutationOperator.init(this, opt); + this.mutationOperator.initialize(this, opt); this.crossoverOperator.init(this, opt); } diff --git a/src/eva2/optimization/individuals/GEIndividualProgramData.java b/src/eva2/optimization/individuals/GEIndividualProgramData.java index 86586431..106199c9 100644 --- a/src/eva2/optimization/individuals/GEIndividualProgramData.java +++ b/src/eva2/optimization/individuals/GEIndividualProgramData.java @@ -595,7 +595,7 @@ public class GEIndividualProgramData extends AbstractEAIndividual implements Int this.defaultInit(opt); System.out.println("Initial value for GPIndividualDoubleData is no InterfaceProgram[]!"); } - this.mutationOperator.init(this, opt); + this.mutationOperator.initialize(this, opt); this.crossoverOperator.init(this, opt); } diff --git a/src/eva2/optimization/individuals/GIIndividualIntegerData.java b/src/eva2/optimization/individuals/GIIndividualIntegerData.java index 18fa866f..714234a4 100644 --- a/src/eva2/optimization/individuals/GIIndividualIntegerData.java +++ b/src/eva2/optimization/individuals/GIIndividualIntegerData.java @@ -240,7 +240,7 @@ public class GIIndividualIntegerData extends AbstractEAIndividual implements Int this.defaultInit(opt); System.out.println("Initial value for GAIndividualDoubleData is not double[]!"); } - this.mutationOperator.init(this, opt); + this.mutationOperator.initialize(this, opt); this.crossoverOperator.init(this, opt); } diff --git a/src/eva2/optimization/individuals/GPIndividualProgramData.java b/src/eva2/optimization/individuals/GPIndividualProgramData.java index de4dc335..5ce00d89 100644 --- a/src/eva2/optimization/individuals/GPIndividualProgramData.java +++ b/src/eva2/optimization/individuals/GPIndividualProgramData.java @@ -241,7 +241,7 @@ public class GPIndividualProgramData extends AbstractEAIndividual implements Int this.defaultInit(opt); System.out.println("Initial value for GPIndividualDoubleData is no InterfaceProgram[]!"); } - this.mutationOperator.init(this, opt); + this.mutationOperator.initialize(this, opt); this.crossoverOperator.init(this, opt); } diff --git a/src/eva2/optimization/individuals/OBGAIndividualPermutationData.java b/src/eva2/optimization/individuals/OBGAIndividualPermutationData.java index 49726161..f3fb3f57 100644 --- a/src/eva2/optimization/individuals/OBGAIndividualPermutationData.java +++ b/src/eva2/optimization/individuals/OBGAIndividualPermutationData.java @@ -105,7 +105,7 @@ public class OBGAIndividualPermutationData extends AbstractEAIndividual implemen this.defaultInit(opt); System.out.println("Initial value for OBGAIndividualBinaryData is no Permutation!"); } - this.mutationOperator.init(this, opt); + this.mutationOperator.initialize(this, opt); this.crossoverOperator.init(this, opt); } diff --git a/src/eva2/optimization/operator/mutation/InterfaceMutation.java b/src/eva2/optimization/operator/mutation/InterfaceMutation.java index a1025435..deb01c56 100644 --- a/src/eva2/optimization/operator/mutation/InterfaceMutation.java +++ b/src/eva2/optimization/operator/mutation/InterfaceMutation.java @@ -23,7 +23,7 @@ public interface InterfaceMutation { * @param individual The individual that will be mutated. * @param opt The optimization problem. */ - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt); + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt); /** * This method will mutate a given AbstractEAIndividual. If the individual diff --git a/src/eva2/optimization/operator/mutation/MutateDefault.java b/src/eva2/optimization/operator/mutation/MutateDefault.java index 4ebcefab..600a8fae 100644 --- a/src/eva2/optimization/operator/mutation/MutateDefault.java +++ b/src/eva2/optimization/operator/mutation/MutateDefault.java @@ -41,7 +41,7 @@ public class MutateDefault implements InterfaceMutation, java.io.Serializable { * @param opt The optimization problem. */ @Override - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { } diff --git a/src/eva2/optimization/operator/mutation/MutateEAMixer.java b/src/eva2/optimization/operator/mutation/MutateEAMixer.java index 593207b7..5897d6f2 100644 --- a/src/eva2/optimization/operator/mutation/MutateEAMixer.java +++ b/src/eva2/optimization/operator/mutation/MutateEAMixer.java @@ -108,10 +108,10 @@ public class MutateEAMixer implements InterfaceMutation, java.io.Serializable { * @param opt The optimization problem. */ @Override - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { InterfaceMutation[] mutators = this.mutationMixer.getSelectedMutators(); for (int i = 0; i < mutators.length; i++) { - mutators[i].init(individual, opt); + mutators[i].initialize(individual, opt); } } diff --git a/src/eva2/optimization/operator/mutation/MutateESCorrVector.java b/src/eva2/optimization/operator/mutation/MutateESCorrVector.java index c7207bb7..be7a6ee3 100644 --- a/src/eva2/optimization/operator/mutation/MutateESCorrVector.java +++ b/src/eva2/optimization/operator/mutation/MutateESCorrVector.java @@ -96,7 +96,7 @@ public class MutateESCorrVector implements InterfaceMutation, java.io.Serializab * @param opt The optimization problem. */ @Override - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { double[] initVelocity = calcInitialVel(initialVelocity, ((InterfaceESIndividual) individual).getDoubleRange()); individual.putData(vectorKey, initVelocity); } diff --git a/src/eva2/optimization/operator/mutation/MutateESCorrolated.java b/src/eva2/optimization/operator/mutation/MutateESCorrelated.java similarity index 95% rename from src/eva2/optimization/operator/mutation/MutateESCorrolated.java rename to src/eva2/optimization/operator/mutation/MutateESCorrelated.java index d62d22c3..a64d0851 100644 --- a/src/eva2/optimization/operator/mutation/MutateESCorrolated.java +++ b/src/eva2/optimization/operator/mutation/MutateESCorrelated.java @@ -10,7 +10,7 @@ import eva2.util.annotation.Description; /** */ @Description("The local correlated mutation stores n sigmas for each double attribute and n(n-1) alphas.") -public class MutateESCorrolated implements InterfaceMutation, java.io.Serializable { +public class MutateESCorrelated implements InterfaceMutation, java.io.Serializable { protected double mutationStepSize = 0.2; protected double tau1 = 0.15; protected double lowerLimitStepSize = 0.0000005; @@ -19,12 +19,12 @@ public class MutateESCorrolated implements InterfaceMutation, java.io.Serializab private double[] alphas = null; protected double tau2 = 0.15; - public MutateESCorrolated() { + public MutateESCorrelated() { this.sigmas = null; this.alphas = null; } - public MutateESCorrolated(MutateESCorrolated mutator) { + public MutateESCorrelated(MutateESCorrelated mutator) { if ((mutator.sigmas != null)) { this.sigmas = new double[mutator.sigmas.length]; System.arraycopy(mutator.sigmas, 0, this.sigmas, 0, this.sigmas.length); @@ -49,7 +49,7 @@ public class MutateESCorrolated implements InterfaceMutation, java.io.Serializab */ @Override public Object clone() { - return new MutateESCorrolated(this); + return new MutateESCorrelated(this); } /** @@ -63,8 +63,8 @@ public class MutateESCorrolated implements InterfaceMutation, java.io.Serializab if (mutator == this) { return true; } - if (mutator instanceof MutateESCorrolated) { - MutateESCorrolated mut = (MutateESCorrolated) mutator; + if (mutator instanceof MutateESCorrelated) { + MutateESCorrelated mut = (MutateESCorrelated) mutator; if (this.tau1 != mut.tau1) { return false; } @@ -105,7 +105,7 @@ public class MutateESCorrolated implements InterfaceMutation, java.io.Serializab * @param opt The optimization problem. */ @Override - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { if (individual instanceof InterfaceESIndividual) { double[] x = ((InterfaceESIndividual) individual).getDGenotype(); if (this.sigmas == null) { diff --git a/src/eva2/optimization/operator/mutation/MutateESCovarianceMatrixAdaption.java b/src/eva2/optimization/operator/mutation/MutateESCovarianceMatrixAdaption.java index d84950a1..fd18d7aa 100644 --- a/src/eva2/optimization/operator/mutation/MutateESCovarianceMatrixAdaption.java +++ b/src/eva2/optimization/operator/mutation/MutateESCovarianceMatrixAdaption.java @@ -140,7 +140,7 @@ public class MutateESCovarianceMatrixAdaption implements InterfaceMutation, java * @param opt The optimization problem. */ @Override - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { if (!(individual instanceof InterfaceESIndividual)) { return; } diff --git a/src/eva2/optimization/operator/mutation/MutateESCovarianceMatrixAdaptionPlus.java b/src/eva2/optimization/operator/mutation/MutateESCovarianceMatrixAdaptionPlus.java index 757bc8c9..c93bfe19 100644 --- a/src/eva2/optimization/operator/mutation/MutateESCovarianceMatrixAdaptionPlus.java +++ b/src/eva2/optimization/operator/mutation/MutateESCovarianceMatrixAdaptionPlus.java @@ -50,13 +50,13 @@ public class MutateESCovarianceMatrixAdaptionPlus extends * @param opt The optimization problem. */ @Override - public void init(AbstractEAIndividual individual, - InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, + InterfaceOptimizationProblem opt) { if (!(individual instanceof InterfaceESIndividual)) { return; } - super.init(individual, opt); + super.initialize(individual, opt); psuccesstarget = 1.0 / (5 + Math.sqrt(lambda) / 2); psuccess = psuccesstarget; stepd = 1.0 + D / (2.0 * lambda); diff --git a/src/eva2/optimization/operator/mutation/MutateESFixedStepSize.java b/src/eva2/optimization/operator/mutation/MutateESFixedStepSize.java index 4696d826..87f6980b 100644 --- a/src/eva2/optimization/operator/mutation/MutateESFixedStepSize.java +++ b/src/eva2/optimization/operator/mutation/MutateESFixedStepSize.java @@ -57,7 +57,7 @@ public class MutateESFixedStepSize implements InterfaceMutation, java.io.Seriali * @param opt The optimization problem. */ @Override - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { } diff --git a/src/eva2/optimization/operator/mutation/MutateESGlobal.java b/src/eva2/optimization/operator/mutation/MutateESGlobal.java index 75821170..34acfecd 100644 --- a/src/eva2/optimization/operator/mutation/MutateESGlobal.java +++ b/src/eva2/optimization/operator/mutation/MutateESGlobal.java @@ -91,7 +91,7 @@ public class MutateESGlobal implements InterfaceMutation, java.io.Serializable, * @param opt The optimization problem. */ @Override - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { } diff --git a/src/eva2/optimization/operator/mutation/MutateESLocal.java b/src/eva2/optimization/operator/mutation/MutateESLocal.java index 77540668..38f0b5ad 100644 --- a/src/eva2/optimization/operator/mutation/MutateESLocal.java +++ b/src/eva2/optimization/operator/mutation/MutateESLocal.java @@ -102,7 +102,7 @@ public class MutateESLocal implements InterfaceMutation, InterfaceAdditionalPopu * @param opt The optimization problem. */ @Override - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { if (individual instanceof InterfaceESIndividual) { // initialize the Sigmas this.sigmas = new double[((InterfaceESIndividual) individual).getDGenotype().length]; diff --git a/src/eva2/optimization/operator/mutation/MutateESMainVectorAdaption.java b/src/eva2/optimization/operator/mutation/MutateESMainVectorAdaption.java index 79a7093e..f5a79005 100644 --- a/src/eva2/optimization/operator/mutation/MutateESMainVectorAdaption.java +++ b/src/eva2/optimization/operator/mutation/MutateESMainVectorAdaption.java @@ -107,7 +107,7 @@ public class MutateESMainVectorAdaption implements InterfaceMutation, java.io.Se * @param opt The optimization problem. */ @Override - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { if (!(individual instanceof InterfaceESIndividual)) { return; } diff --git a/src/eva2/optimization/operator/mutation/MutateESMutativeStepSizeControl.java b/src/eva2/optimization/operator/mutation/MutateESMutativeStepSizeControl.java index 9e0e7bc5..c0af7341 100644 --- a/src/eva2/optimization/operator/mutation/MutateESMutativeStepSizeControl.java +++ b/src/eva2/optimization/operator/mutation/MutateESMutativeStepSizeControl.java @@ -85,7 +85,7 @@ public class MutateESMutativeStepSizeControl implements InterfaceMutation, java. * @param opt The optimization problem. */ @Override - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { } diff --git a/src/eva2/optimization/operator/mutation/MutateESPathLengthAdaption.java b/src/eva2/optimization/operator/mutation/MutateESPathLengthAdaption.java index 9af3e267..fd5b8816 100644 --- a/src/eva2/optimization/operator/mutation/MutateESPathLengthAdaption.java +++ b/src/eva2/optimization/operator/mutation/MutateESPathLengthAdaption.java @@ -104,7 +104,7 @@ public class MutateESPathLengthAdaption implements InterfaceMutation, java.io.Se * @param opt The optimization problem. */ @Override - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { if (!(individual instanceof InterfaceESIndividual)) { return; } diff --git a/src/eva2/optimization/operator/mutation/MutateESPolynomial.java b/src/eva2/optimization/operator/mutation/MutateESPolynomial.java index 3e25705d..b7a0c3ff 100644 --- a/src/eva2/optimization/operator/mutation/MutateESPolynomial.java +++ b/src/eva2/optimization/operator/mutation/MutateESPolynomial.java @@ -58,7 +58,7 @@ public class MutateESPolynomial implements InterfaceMutation, java.io.Serializab * @param opt The optimization problem. */ @Override - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { } diff --git a/src/eva2/optimization/operator/mutation/MutateESRankMuCMA.java b/src/eva2/optimization/operator/mutation/MutateESRankMuCMA.java index 4d374348..7d370d70 100644 --- a/src/eva2/optimization/operator/mutation/MutateESRankMuCMA.java +++ b/src/eva2/optimization/operator/mutation/MutateESRankMuCMA.java @@ -519,8 +519,8 @@ public class MutateESRankMuCMA implements InterfaceAdaptOperatorGenerational, In } @Override - public void init(AbstractEAIndividual individual, - InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, + InterfaceOptimizationProblem opt) { double[][] range = ((InterfaceDataTypeDouble) individual).getDoubleRange(); int dim = range.length; c_c = (4. / (dim + 4)); diff --git a/src/eva2/optimization/operator/mutation/MutateGAAdaptive.java b/src/eva2/optimization/operator/mutation/MutateGAAdaptive.java index 7e06a2b0..7b030cb6 100644 --- a/src/eva2/optimization/operator/mutation/MutateGAAdaptive.java +++ b/src/eva2/optimization/operator/mutation/MutateGAAdaptive.java @@ -70,7 +70,7 @@ public class MutateGAAdaptive implements InterfaceMutation, java.io.Serializable * @param opt The optimization problem. */ @Override - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { } diff --git a/src/eva2/optimization/operator/mutation/MutateGAGISwapBits.java b/src/eva2/optimization/operator/mutation/MutateGAGISwapBits.java index 1109e8ae..12d7bb79 100644 --- a/src/eva2/optimization/operator/mutation/MutateGAGISwapBits.java +++ b/src/eva2/optimization/operator/mutation/MutateGAGISwapBits.java @@ -75,7 +75,7 @@ public class MutateGAGISwapBits implements InterfaceMutation, java.io.Serializab * @param opt The optimization problem. */ @Override - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { } diff --git a/src/eva2/optimization/operator/mutation/MutateGAInvertBits.java b/src/eva2/optimization/operator/mutation/MutateGAInvertBits.java index b7558da0..b29ab086 100644 --- a/src/eva2/optimization/operator/mutation/MutateGAInvertBits.java +++ b/src/eva2/optimization/operator/mutation/MutateGAInvertBits.java @@ -62,7 +62,7 @@ public class MutateGAInvertBits implements InterfaceMutation, java.io.Serializab * @param opt The optimization problem. */ @Override - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { } /** diff --git a/src/eva2/optimization/operator/mutation/MutateGANBit.java b/src/eva2/optimization/operator/mutation/MutateGANBit.java index b2890510..37713f73 100644 --- a/src/eva2/optimization/operator/mutation/MutateGANBit.java +++ b/src/eva2/optimization/operator/mutation/MutateGANBit.java @@ -57,7 +57,7 @@ public class MutateGANBit implements InterfaceMutation, java.io.Serializable { * @param opt The optimization problem. */ @Override - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { } /** diff --git a/src/eva2/optimization/operator/mutation/MutateGAShiftSubstring.java b/src/eva2/optimization/operator/mutation/MutateGAShiftSubstring.java index 59d921f0..15c05be4 100644 --- a/src/eva2/optimization/operator/mutation/MutateGAShiftSubstring.java +++ b/src/eva2/optimization/operator/mutation/MutateGAShiftSubstring.java @@ -65,7 +65,7 @@ public class MutateGAShiftSubstring implements InterfaceMutation, java.io.Serial * @param opt The optimization problem. */ @Override - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { } diff --git a/src/eva2/optimization/operator/mutation/MutateGASwapBitsSegmentwise.java b/src/eva2/optimization/operator/mutation/MutateGASwapBitsSegmentwise.java index 10814dd0..a848056e 100644 --- a/src/eva2/optimization/operator/mutation/MutateGASwapBitsSegmentwise.java +++ b/src/eva2/optimization/operator/mutation/MutateGASwapBitsSegmentwise.java @@ -97,7 +97,7 @@ public class MutateGASwapBitsSegmentwise implements InterfaceMutation, java.io.S * @param opt The optimization problem. */ @Override - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { } diff --git a/src/eva2/optimization/operator/mutation/MutateGAUniform.java b/src/eva2/optimization/operator/mutation/MutateGAUniform.java index b6872a52..ccb33d40 100644 --- a/src/eva2/optimization/operator/mutation/MutateGAUniform.java +++ b/src/eva2/optimization/operator/mutation/MutateGAUniform.java @@ -53,8 +53,8 @@ public class MutateGAUniform implements InterfaceMutation, Serializable { } @Override - public void init(AbstractEAIndividual individual, - InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, + InterfaceOptimizationProblem opt) { if (useInvertedLength && (individual instanceof InterfaceGAIndividual)) { setBitwiseProb(1. / ((double) ((InterfaceGAIndividual) individual).getGenotypeLength())); } diff --git a/src/eva2/optimization/operator/mutation/MutateGIInsertDelete.java b/src/eva2/optimization/operator/mutation/MutateGIInsertDelete.java index fd5d2cc2..cbbbe8bd 100644 --- a/src/eva2/optimization/operator/mutation/MutateGIInsertDelete.java +++ b/src/eva2/optimization/operator/mutation/MutateGIInsertDelete.java @@ -55,7 +55,7 @@ public class MutateGIInsertDelete implements InterfaceMutation, java.io.Serializ * @param opt The optimization problem. */ @Override - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { } diff --git a/src/eva2/optimization/operator/mutation/MutateGIInvert.java b/src/eva2/optimization/operator/mutation/MutateGIInvert.java index 1b4cbcfb..6db785da 100644 --- a/src/eva2/optimization/operator/mutation/MutateGIInvert.java +++ b/src/eva2/optimization/operator/mutation/MutateGIInvert.java @@ -55,7 +55,7 @@ public class MutateGIInvert implements InterfaceMutation, java.io.Serializable { * @param opt The optimization problem. */ @Override - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { } diff --git a/src/eva2/optimization/operator/mutation/MutateGINominal.java b/src/eva2/optimization/operator/mutation/MutateGINominal.java index de07a7dd..91a9aad4 100644 --- a/src/eva2/optimization/operator/mutation/MutateGINominal.java +++ b/src/eva2/optimization/operator/mutation/MutateGINominal.java @@ -55,7 +55,7 @@ public class MutateGINominal implements InterfaceMutation, java.io.Serializable * @param opt The optimization problem. */ @Override - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { } diff --git a/src/eva2/optimization/operator/mutation/MutateGIOrdinal.java b/src/eva2/optimization/operator/mutation/MutateGIOrdinal.java index a9d6ccb4..40d4ea1c 100644 --- a/src/eva2/optimization/operator/mutation/MutateGIOrdinal.java +++ b/src/eva2/optimization/operator/mutation/MutateGIOrdinal.java @@ -60,7 +60,7 @@ public class MutateGIOrdinal implements InterfaceMutation, java.io.Serializable * @param opt The optimization problem. */ @Override - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { } diff --git a/src/eva2/optimization/operator/mutation/MutateGISubset.java b/src/eva2/optimization/operator/mutation/MutateGISubset.java index d1eab3a6..98cee1ce 100644 --- a/src/eva2/optimization/operator/mutation/MutateGISubset.java +++ b/src/eva2/optimization/operator/mutation/MutateGISubset.java @@ -61,8 +61,8 @@ public class MutateGISubset implements InterfaceMutation, Serializable { } @Override - public void init(AbstractEAIndividual individual, - InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, + InterfaceOptimizationProblem opt) { // nothing to do } diff --git a/src/eva2/optimization/operator/mutation/MutateGITranslocate.java b/src/eva2/optimization/operator/mutation/MutateGITranslocate.java index b602530f..3b03cf1c 100644 --- a/src/eva2/optimization/operator/mutation/MutateGITranslocate.java +++ b/src/eva2/optimization/operator/mutation/MutateGITranslocate.java @@ -70,7 +70,7 @@ public class MutateGITranslocate implements InterfaceMutation, java.io.Serializa * @param opt The optimization problem. */ @Override - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { } diff --git a/src/eva2/optimization/operator/mutation/MutateGPAdaptive.java b/src/eva2/optimization/operator/mutation/MutateGPAdaptive.java index 89e4ba81..efef4933 100644 --- a/src/eva2/optimization/operator/mutation/MutateGPAdaptive.java +++ b/src/eva2/optimization/operator/mutation/MutateGPAdaptive.java @@ -70,7 +70,7 @@ public class MutateGPAdaptive implements InterfaceMutation, java.io.Serializable * @param opt The optimization problem. */ @Override - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { } diff --git a/src/eva2/optimization/operator/mutation/MutateGPSingleNode.java b/src/eva2/optimization/operator/mutation/MutateGPSingleNode.java index 51bb2608..4a22472c 100644 --- a/src/eva2/optimization/operator/mutation/MutateGPSingleNode.java +++ b/src/eva2/optimization/operator/mutation/MutateGPSingleNode.java @@ -45,7 +45,7 @@ public class MutateGPSingleNode implements InterfaceMutation, java.io.Serializab * @param opt The optimization problem. */ @Override - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { } diff --git a/src/eva2/optimization/operator/mutation/MutateOBGAFlip.java b/src/eva2/optimization/operator/mutation/MutateOBGAFlip.java index 333ccbea..c10bdefc 100644 --- a/src/eva2/optimization/operator/mutation/MutateOBGAFlip.java +++ b/src/eva2/optimization/operator/mutation/MutateOBGAFlip.java @@ -38,7 +38,7 @@ public class MutateOBGAFlip implements InterfaceMutation, java.io.Serializable { } @Override - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { //nothing to initialize } diff --git a/src/eva2/optimization/operator/mutation/MutateOBGAInversion.java b/src/eva2/optimization/operator/mutation/MutateOBGAInversion.java index ef41669b..6f1ac2f2 100644 --- a/src/eva2/optimization/operator/mutation/MutateOBGAInversion.java +++ b/src/eva2/optimization/operator/mutation/MutateOBGAInversion.java @@ -40,7 +40,7 @@ public class MutateOBGAInversion implements java.io.Serializable, InterfaceMutat } @Override - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { //nothing to initialize } diff --git a/src/eva2/optimization/operator/mutation/NoMutation.java b/src/eva2/optimization/operator/mutation/NoMutation.java index dc0393f7..6168cc0e 100644 --- a/src/eva2/optimization/operator/mutation/NoMutation.java +++ b/src/eva2/optimization/operator/mutation/NoMutation.java @@ -39,7 +39,7 @@ public class NoMutation implements InterfaceMutation, java.io.Serializable { * @param opt The optimization problem. */ @Override - public void init(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { + public void initialize(AbstractEAIndividual individual, InterfaceOptimizationProblem opt) { } /** diff --git a/src/eva2/optimization/operator/postprocess/PostProcess.java b/src/eva2/optimization/operator/postprocess/PostProcess.java index 4ed31919..13b7d703 100644 --- a/src/eva2/optimization/operator/postprocess/PostProcess.java +++ b/src/eva2/optimization/operator/postprocess/PostProcess.java @@ -395,7 +395,7 @@ public class PostProcess { HillClimbing hc = new HillClimbing(); // HC depends heavily on the selected mutation operator! hc.setProblem(problem); - mute.init(problem.getIndividualTemplate(), problem); + mute.initialize(problem.getIndividualTemplate(), problem); hc.setMutationOperator(mute); if (pop.size() != pop.getTargetSize()) { System.err.println(pop.size() + " vs. " + pop.getTargetSize());