halfdan/eva2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

CMA rename was missing.

Browse Source
This commit is contained in:
Marcel Kronfeld 2008-08-13 08:06:34 +00:00
parent 249ceb6f3b
commit 88b32e9e68
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/eva2/OptimizerFactory.java
View File

@ -22,7 +22,7 @@ import eva2.server.go.operators.crossover.CrossoverESDefault;
import eva2.server.go.operators.crossover.InterfaceCrossover; import eva2.server.go.operators.crossover.InterfaceCrossover;
import eva2.server.go.operators.crossover.NoCrossover; import eva2.server.go.operators.crossover.NoCrossover;
import eva2.server.go.operators.mutation.InterfaceMutation; 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.MutateESFixedStepSize;
import eva2.server.go.operators.mutation.MutateESGlobal; import eva2.server.go.operators.mutation.MutateESGlobal;
import eva2.server.go.operators.mutation.NoMutation; import eva2.server.go.operators.mutation.NoMutation;
@ -168,7 +168,7 @@ public class OptimizerFactory {
&& (indyTemplate instanceof InterfaceESIndividual)) { && (indyTemplate instanceof InterfaceESIndividual)) {
// Set CMA operator for mutation // Set CMA operator for mutation
AbstractEAIndividual indy = (AbstractEAIndividual) indyTemplate; AbstractEAIndividual indy = (AbstractEAIndividual) indyTemplate;
MutateESCovarianceMartixAdaption cmaMut = new MutateESCovarianceMartixAdaption(); MutateESCovarianceMatrixAdaption cmaMut = new MutateESCovarianceMatrixAdaption();
cmaMut.setCheckConstraints(true); cmaMut.setCheckConstraints(true);
indy.setMutationOperator(cmaMut); indy.setMutationOperator(cmaMut);
indy.setCrossoverOperator(new CrossoverESDefault()); indy.setCrossoverOperator(new CrossoverESDefault());

6
src/eva2/server/go/strategies/ParticleSwarmOptimization.java
View File

@ -1475,6 +1475,12 @@ public class ParticleSwarmOptimization implements InterfaceOptimizer, java.io.Se
public InterfaceSolutionSet getAllSolutions() { public InterfaceSolutionSet getAllSolutions() {
return new SolutionSet(getPopulation()); return new SolutionSet(getPopulation());
} }
public AbstractEAIndividual getBestIndividual() {
return m_BestIndividual;
}
/** This method will set the initial velocity /** This method will set the initial velocity
* @param f * @param f
*/ */