From 050af6e8e03a5b757d0bbd44bba8c0e59d413055 Mon Sep 17 00:00:00 2001 From: Marcel Kronfeld Date: Thu, 5 Aug 2010 15:31:17 +0000 Subject: [PATCH] Merging MK branch rev 586 (best-of-run in AbstractStatistics) --- src/eva2/server/stat/AbstractStatistics.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/eva2/server/stat/AbstractStatistics.java b/src/eva2/server/stat/AbstractStatistics.java index 079107c2..c1dd032d 100644 --- a/src/eva2/server/stat/AbstractStatistics.java +++ b/src/eva2/server/stat/AbstractStatistics.java @@ -292,9 +292,9 @@ public abstract class AbstractStatistics implements InterfaceTextListener, Inter functionCallSum += functionCalls; if (printRunStoppedVerbosity() && (stopMessage != null)) printToTextListener(" Termination message: " + stopMessage + "\n"); if (printRunStoppedVerbosity()) printToTextListener(" Function calls run: " + functionCalls + ", sum: " + functionCallSum + "\n"); - // check for convergence + // check if target zero was reached if (bestCurrentIndy != null) { - if (Mathematics.norm(bestCurrentIndy.getFitness()) < this.m_StatsParams.getConvergenceRateThreshold()) { + if (Mathematics.norm(bestOfRunIndy.getFitness()) < this.m_StatsParams.getConvergenceRateThreshold()) { convergenceCnt++; } if (printRunStoppedVerbosity()) printIndy("Last best", bestCurrentIndy);