From b1e5c7a41092d07f16ba8c626845d6e584e9eeae Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Mon, 1 Dec 2014 12:32:26 +0000 Subject: [PATCH] Properly deactivate auto-aging --- src/eva2/optimization/population/Population.java | 2 -- src/eva2/optimization/strategies/ArtificialBeeColony.java | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/eva2/optimization/population/Population.java b/src/eva2/optimization/population/Population.java index f9fd982e..abf9fae0 100644 --- a/src/eva2/optimization/population/Population.java +++ b/src/eva2/optimization/population/Population.java @@ -637,7 +637,6 @@ public class Population extends ArrayList implements Popul */ public void incrFunctionCallsBy(int d) { if (doEvalNotify()) { -// System.out.println("checking funcall event..."); int nextStep; // next interval boundary while ((nextStep = calcNextBoundary()) <= (functionCallCount + d)) { // the notify interval will be stepped over or hit @@ -645,7 +644,6 @@ public class Population extends ArrayList implements Popul this.functionCallCount += toHit; // little cheat, notify may be after some more evals firePropertyChangedEvent(FUN_CALL_INTERVAL_REACHED); d -= toHit; -// this.functionCalls += (d-toHit); } if (d > 0) { this.functionCallCount += d; // add up the rest diff --git a/src/eva2/optimization/strategies/ArtificialBeeColony.java b/src/eva2/optimization/strategies/ArtificialBeeColony.java index 0b9c1980..a9f330f3 100644 --- a/src/eva2/optimization/strategies/ArtificialBeeColony.java +++ b/src/eva2/optimization/strategies/ArtificialBeeColony.java @@ -56,6 +56,7 @@ public class ArtificialBeeColony extends AbstractOptimizer implements InterfaceA @Override public void initialize() { this.scoutCount = 0; + this.population.setAutoAging(false); this.optimizationProblem.initializePopulation(this.population); this.evaluatePopulation(this.population); this.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED);