From c4ebba116f0c70ccd9407e2317c6720cc6d22af4 Mon Sep 17 00:00:00 2001 From: Marcel Kronfeld Date: Mon, 16 Aug 2010 10:15:53 +0000 Subject: [PATCH] Updated EvAInfo, version number. --- resources/EvA2.props | 2 +- src/eva2/EvAInfo.java | 4 ++++ .../go/operators/terminators/ParetoMetricTerminator.java | 7 +++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/resources/EvA2.props b/resources/EvA2.props index d9800fe9..d6296dfa 100644 --- a/resources/EvA2.props +++ b/resources/EvA2.props @@ -18,4 +18,4 @@ ModulePackage = eva2.server.modules ModuleFilterClass = eva2.server.modules.AbstractModuleAdapter # Full EvA2 version number -EvA2Version = 2.043 \ No newline at end of file +EvA2Version = 2.045 \ No newline at end of file diff --git a/src/eva2/EvAInfo.java b/src/eva2/EvAInfo.java index 04172120..310a594b 100644 --- a/src/eva2/EvAInfo.java +++ b/src/eva2/EvAInfo.java @@ -9,6 +9,10 @@ import eva2.tools.BasicResourceLoader; * Main product and version information strings. * * --- Changelog + * 2.045: Added MOOCMAES (de Paly); compatibility with Java 1.5 (Draeger); Revision of the statistics class + * with improved pipelining of data (InterfaceAdditionalPopulationInformer); improved FunctionArea + * concerning history, labels, legend and graph coloring; improved StringSelection; restructured + * Terminators, additional ParetoMetricTerminator. Further bugfixes and clean-ups. * 2.043: Added proper Population equality predicate. * 2.042: Some bugfixes. Removing dependency on sun.beans.editors, replaced non-free jpeg-codec. There should * be no more problems on OpenJDK. Added a simple initialization range, especially for use from Matlab. diff --git a/src/eva2/server/go/operators/terminators/ParetoMetricTerminator.java b/src/eva2/server/go/operators/terminators/ParetoMetricTerminator.java index d07fb569..f4e079dd 100644 --- a/src/eva2/server/go/operators/terminators/ParetoMetricTerminator.java +++ b/src/eva2/server/go/operators/terminators/ParetoMetricTerminator.java @@ -30,8 +30,6 @@ public class ParetoMetricTerminator extends PopulationMeasureTerminator implemen moProb=null; } - //public PopulationMeasureTerminator(double convergenceThreshold, int stagnationTime, boolean bFitCallBased, ChangeTypeEnum detectChangeType, boolean bImprovement) { - public ParetoMetricTerminator(InterfaceParetoFrontMetric metric, boolean useCurrentPop, double convergenceThreshold, int stagnationTime, StagnationTypeEnum stagType, ChangeTypeEnum changeType, DirectionTypeEnum dirType) { super(convergenceThreshold, stagnationTime, stagType, changeType, dirType); this.pMetric = metric; @@ -80,6 +78,11 @@ public class ParetoMetricTerminator extends PopulationMeasureTerminator implemen else return metricName; } + public static String globalInfo() { + return "Terminate if the pareto front of a multi-objective optimization process converges " + + "with respect to a certain measure."; + } + public void setParetoMetric(InterfaceParetoFrontMetric pMetric) { this.pMetric = pMetric; }