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

Lots of refactoring.

Browse Source 
* Renamed m_foo variables to proper names.
* Renamed methods with abbreviated names
* Code formatting for better readability
* Removed commented code
This commit is contained in:
Fabian Becker
2013-06-25 16:20:51 +02:00
parent bcf9e6fd6f
commit bf1af304dd
120 changed files with 2064 additions and 2369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/eva2/optimization/individuals/GEIndividualProgramData.java
View File

@@ -41,10 +41,10 @@ public class GEIndividualProgramData extends AbstractEAIndividual implements Int
this.m_Area = new GPArea[1];
this.m_GenotypeLengthPerProgram = 240;
this.m_Genotype = new BitSet();
this.m_MutationOperator = new MutateDefault();
this.m_CrossoverOperator = new CrossoverGADefault();
this.m_MutationProbability = 0.5;
this.m_CrossoverProbability = 0.5;
this.mutationOperator = new MutateDefault();
this.crossoverOperator = new CrossoverGADefault();
this.mutationProbability = 0.5;
this.crossoverProbability = 0.5;
}
public GEIndividualProgramData(GEIndividualProgramData individual) {
@@ -92,18 +92,18 @@ public class GEIndividualProgramData extends AbstractEAIndividual implements Int
}
}
// cloning the members of AbstractEAIndividual
this.m_Age = individual.m_Age;
this.m_CrossoverOperator = individual.m_CrossoverOperator;
this.m_CrossoverProbability = individual.m_CrossoverProbability;
this.m_MutationOperator = (InterfaceMutation)individual.m_MutationOperator.clone();
this.m_MutationProbability = individual.m_MutationProbability;
this.m_SelectionProbability = new double[individual.m_SelectionProbability.length];
for (int i = 0; i < this.m_SelectionProbability.length; i++) {
this.m_SelectionProbability[i] = individual.m_SelectionProbability[i];
this.age = individual.age;
this.crossoverOperator = individual.crossoverOperator;
this.crossoverProbability = individual.crossoverProbability;
this.mutationOperator = (InterfaceMutation)individual.mutationOperator.clone();
this.mutationProbability = individual.mutationProbability;
this.selectionProbability = new double[individual.selectionProbability.length];
for (int i = 0; i < this.selectionProbability.length; i++) {
this.selectionProbability[i] = individual.selectionProbability[i];
}
this.m_Fitness = new double[individual.m_Fitness.length];
for (int i = 0; i < this.m_Fitness.length; i++) {
this.m_Fitness[i] = individual.m_Fitness[i];
this.fitness = new double[individual.fitness.length];
for (int i = 0; i < this.fitness.length; i++) {
this.fitness[i] = individual.fitness[i];
}
cloneAEAObjects((AbstractEAIndividual) individual);
}
@@ -576,8 +576,8 @@ public class GEIndividualProgramData extends AbstractEAIndividual implements Int
this.defaultInit(opt);
System.out.println("Initial value for GPIndividualDoubleData is no InterfaceProgram[]!");
}
this.m_MutationOperator.init(this, opt);
this.m_CrossoverOperator.init(this, opt);
this.mutationOperator.init(this, opt);
this.crossoverOperator.init(this, opt);
}
/** This method will return a string description of the GAIndividal