diff --git a/src/eva2/OptimizerFactory.java b/src/eva2/OptimizerFactory.java index 2025615b..619ff3c5 100644 --- a/src/eva2/OptimizerFactory.java +++ b/src/eva2/OptimizerFactory.java @@ -22,7 +22,7 @@ import eva2.server.go.operators.crossover.CrossoverESDefault; import eva2.server.go.operators.crossover.InterfaceCrossover; import eva2.server.go.operators.crossover.NoCrossover; import eva2.server.go.operators.mutation.InterfaceMutation; -import eva2.server.go.operators.mutation.MutateESCovarianceMartixAdaption; +import eva2.server.go.operators.mutation.MutateESCovarianceMatrixAdaption; import eva2.server.go.operators.mutation.MutateESFixedStepSize; import eva2.server.go.operators.mutation.MutateESGlobal; import eva2.server.go.operators.mutation.NoMutation; @@ -168,7 +168,7 @@ public class OptimizerFactory { && (indyTemplate instanceof InterfaceESIndividual)) { // Set CMA operator for mutation AbstractEAIndividual indy = (AbstractEAIndividual) indyTemplate; - MutateESCovarianceMartixAdaption cmaMut = new MutateESCovarianceMartixAdaption(); + MutateESCovarianceMatrixAdaption cmaMut = new MutateESCovarianceMatrixAdaption(); cmaMut.setCheckConstraints(true); indy.setMutationOperator(cmaMut); indy.setCrossoverOperator(new CrossoverESDefault()); diff --git a/src/eva2/server/go/strategies/ParticleSwarmOptimization.java b/src/eva2/server/go/strategies/ParticleSwarmOptimization.java index 7dbb33e9..6be88ba5 100644 --- a/src/eva2/server/go/strategies/ParticleSwarmOptimization.java +++ b/src/eva2/server/go/strategies/ParticleSwarmOptimization.java @@ -1475,6 +1475,12 @@ public class ParticleSwarmOptimization implements InterfaceOptimizer, java.io.Se public InterfaceSolutionSet getAllSolutions() { return new SolutionSet(getPopulation()); } + + public AbstractEAIndividual getBestIndividual() { + return m_BestIndividual; + } + + /** This method will set the initial velocity * @param f */