From 76bbf3ca2fd233784919498aa5bac6789568b199 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Sat, 20 Dec 2014 13:10:34 +0100 Subject: [PATCH] Problem documentation. --- src/eva2/problems/AbstractProblemDouble.java | 15 ++++----------- src/eva2/problems/F15Problem.java | 4 +++- src/eva2/problems/F1Problem.java | 2 +- src/eva2/problems/F22Problem.java | 2 +- src/eva2/problems/F2Problem.java | 3 +++ src/eva2/problems/F3Problem.java | 2 +- src/eva2/problems/F4Problem.java | 2 +- src/eva2/problems/F5Problem.java | 2 +- src/eva2/problems/F7Problem.java | 2 +- src/eva2/problems/F8Problem.java | 1 - 10 files changed, 16 insertions(+), 19 deletions(-) diff --git a/src/eva2/problems/AbstractProblemDouble.java b/src/eva2/problems/AbstractProblemDouble.java index 3d597b2a..e8692a2c 100644 --- a/src/eva2/problems/AbstractProblemDouble.java +++ b/src/eva2/problems/AbstractProblemDouble.java @@ -572,24 +572,17 @@ public abstract class AbstractProblemDouble extends AbstractOptimizationProblem return isShowing; } + @Parameter(description = "Produce an exemplary 2D plot of the function (dimensional cut at x_i=0 for n>1).") public void setShowPlot(boolean showP) { if (!isShowing && showP) { TopoPlot plot = new TopoPlot(getName(), "x1", "x2"); - plot.setParams(60, 60, ColorBarCalculator.BLUE_TO_RED); + plot.setParams(100, 100, ColorBarCalculator.BLUE_TO_RED); this.initializeProblem(); plot.setTopology(this, makeRange(), true); - if (this instanceof InterfaceMultimodalProblemKnown - && ((InterfaceMultimodalProblemKnown) this) - .fullListAvailable()) { - plot.drawPopulation("Opt", - ((InterfaceMultimodalProblemKnown) this) - .getRealOptima()); + if (this instanceof InterfaceMultimodalProblemKnown && ((InterfaceMultimodalProblemKnown) this).fullListAvailable()) { + plot.drawPopulation("Opt", ((InterfaceMultimodalProblemKnown) this).getRealOptima()); } } isShowing = showP; } - - public String showPlotTipText() { - return "Produce an exemplary 2D plot of the function (dimensional cut at x_i=0 for n>1)."; - } } diff --git a/src/eva2/problems/F15Problem.java b/src/eva2/problems/F15Problem.java index e522c52d..a9e7957b 100644 --- a/src/eva2/problems/F15Problem.java +++ b/src/eva2/problems/F15Problem.java @@ -6,6 +6,8 @@ import eva2.util.annotation.Description; import java.io.Serializable; /** + * Levy function. + * * The Levy-function, from Levy, A., and Montalvo, A. (1985). Also described in * "A Trust-Region Algorithm for Global Optimization", Bernardetta Addisy and Sven Leyfferz, 2004/2006. */ @@ -69,6 +71,6 @@ public class F15Problem extends AbstractProblemDouble implements Serializable, I @Override public String getName() { - return "F15Problem"; + return "Levy function"; } } diff --git a/src/eva2/problems/F1Problem.java b/src/eva2/problems/F1Problem.java index 0d9d3b70..b1484530 100644 --- a/src/eva2/problems/F1Problem.java +++ b/src/eva2/problems/F1Problem.java @@ -5,7 +5,7 @@ import eva2.tools.math.Mathematics; import eva2.util.annotation.Description; /** - * F1 Sphere Problem + * Sphere Problem */ @Description(value ="Sphere Problem") public class F1Problem extends AbstractProblemDoubleOffset implements Interface2DBorderProblem, InterfaceHasInitRange, java.io.Serializable, InterfaceFirstOrderDerivableProblem { diff --git a/src/eva2/problems/F22Problem.java b/src/eva2/problems/F22Problem.java index 8478e81e..0e54fdab 100644 --- a/src/eva2/problems/F22Problem.java +++ b/src/eva2/problems/F22Problem.java @@ -4,7 +4,7 @@ import eva2.optimization.strategies.InterfaceOptimizer; import eva2.util.annotation.Description; /** - * F22 Schwefel 2.22 Problem + * Schwefel 2.22 function */ @Description(value ="Schwefel 2.22") public class F22Problem extends AbstractProblemDoubleOffset implements InterfaceHasInitRange, java.io.Serializable { diff --git a/src/eva2/problems/F2Problem.java b/src/eva2/problems/F2Problem.java index 28290f93..eb716507 100644 --- a/src/eva2/problems/F2Problem.java +++ b/src/eva2/problems/F2Problem.java @@ -5,6 +5,9 @@ import eva2.optimization.population.Population; import eva2.optimization.strategies.GradientDescentAlgorithm; import eva2.util.annotation.Description; +/** + * Generalized Rosenbrock's Function + */ @Description(value ="Generalized Rosenbrock's function.") @SuppressWarnings("unused") public class F2Problem extends AbstractProblemDoubleOffset implements InterfaceLocalSearchable, InterfaceMultimodalProblem, java.io.Serializable, InterfaceFirstOrderDerivableProblem { diff --git a/src/eva2/problems/F3Problem.java b/src/eva2/problems/F3Problem.java index 696f01f3..9ce4297d 100644 --- a/src/eva2/problems/F3Problem.java +++ b/src/eva2/problems/F3Problem.java @@ -4,7 +4,7 @@ import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.util.annotation.Description; /** - * + * Step function */ @Description("Step function.") public class F3Problem extends AbstractProblemDoubleOffset implements java.io.Serializable { diff --git a/src/eva2/problems/F4Problem.java b/src/eva2/problems/F4Problem.java index 1eaad825..40973378 100644 --- a/src/eva2/problems/F4Problem.java +++ b/src/eva2/problems/F4Problem.java @@ -5,7 +5,7 @@ import eva2.util.annotation.Description; import java.io.Serializable; /** - * + * Quadratic function with noise. */ @SuppressWarnings("unused") @Description("Quadratic Function with noise.") diff --git a/src/eva2/problems/F5Problem.java b/src/eva2/problems/F5Problem.java index 8b5f022f..c0309768 100644 --- a/src/eva2/problems/F5Problem.java +++ b/src/eva2/problems/F5Problem.java @@ -5,7 +5,7 @@ import eva2.util.annotation.Description; import java.io.Serializable; /** - * + * Schwefel's 1.2 */ @Description("Schwefel's 1.2 Function.") public class F5Problem extends AbstractProblemDoubleOffset implements Serializable { diff --git a/src/eva2/problems/F7Problem.java b/src/eva2/problems/F7Problem.java index 072755dd..55fdcec5 100644 --- a/src/eva2/problems/F7Problem.java +++ b/src/eva2/problems/F7Problem.java @@ -9,7 +9,7 @@ import eva2.util.annotation.Parameter; import java.io.Serializable; /** - * + * Sphere with changing environment */ @Description("Sphere Model, changing Environment.") public class F7Problem extends AbstractProblemDoubleOffset implements Serializable { diff --git a/src/eva2/problems/F8Problem.java b/src/eva2/problems/F8Problem.java index 7c02ab73..4bf03bba 100644 --- a/src/eva2/problems/F8Problem.java +++ b/src/eva2/problems/F8Problem.java @@ -11,7 +11,6 @@ import eva2.util.annotation.Description; import java.util.Arrays; - /** * Ackley's function. */