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

Fix GGABC (Gbest-Guided) and correctly count function calls.

Browse Source
This commit is contained in:
Fabian Becker 2014-12-01 18:41:12 +01:00
parent 794eeed998
commit b19d1c5d39
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/eva2/optimization/operator/selection/SelectXProbRouletteWheel.java
View File

@ -13,7 +13,7 @@ import eva2.util.annotation.Description;
* criteria is selected randomly for each selection event. * criteria is selected randomly for each selection event.
*/ */
@Description("This method chooses individuals similar to the roulette wheel. The chance for each individual to be selected depends on the selection probability." + @Description("This method chooses individuals similar to the roulette wheel. The chance for each individual to be selected depends on the selection probability." +
"This is a single objective selecting method, it select with respect to a random criterion.") "This is a single objective selectiog method, it select with respect to a random criterion.")
public class SelectXProbRouletteWheel implements InterfaceSelection, java.io.Serializable { public class SelectXProbRouletteWheel implements InterfaceSelection, java.io.Serializable {
private transient TreeElement[] treeRoot = null; private transient TreeElement[] treeRoot = null;

1
src/eva2/optimization/strategies/ArtificialBeeColony.java
View File

@ -59,6 +59,7 @@ public class ArtificialBeeColony extends AbstractOptimizer implements InterfaceA
this.population.setAutoAging(false); this.population.setAutoAging(false);
this.optimizationProblem.initializePopulation(this.population); this.optimizationProblem.initializePopulation(this.population);
this.evaluatePopulation(this.population); this.evaluatePopulation(this.population);
this.bestIndividual = this.population.getBestEAIndividual();
this.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED); this.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED);
} }