From 2293195be4b878693605c6321379b664b26f6ba6 Mon Sep 17 00:00:00 2001 From: Marcel Kronfeld Date: Thu, 28 Apr 2011 14:32:39 +0000 Subject: [PATCH] Minor cosmetics --- src/eva2/server/go/problems/B1Problem.java | 2 +- .../server/go/problems/BKnapsackProblem.java | 18 ++++++++++++++---- .../server/go/strategies/IslandModelEA.java | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/eva2/server/go/problems/B1Problem.java b/src/eva2/server/go/problems/B1Problem.java index 619c5298..83141e74 100644 --- a/src/eva2/server/go/problems/B1Problem.java +++ b/src/eva2/server/go/problems/B1Problem.java @@ -124,7 +124,7 @@ public class B1Problem extends AbstractProblemBinary implements java.io.Serializ public InterfaceDataTypeBinary getEAIndividual() { return (InterfaceDataTypeBinary) this.m_Template; } - public String eAIndividualTipText() { + public String EAIndividualTipText() { return "Choose the EAIndividual to use."; } } diff --git a/src/eva2/server/go/problems/BKnapsackProblem.java b/src/eva2/server/go/problems/BKnapsackProblem.java index 477f7da2..14cb765f 100644 --- a/src/eva2/server/go/problems/BKnapsackProblem.java +++ b/src/eva2/server/go/problems/BKnapsackProblem.java @@ -359,8 +359,8 @@ public class BKnapsackProblem extends AbstractProblemBinary implements java.io.S public InterfaceDataTypeBinary getEAIndividual() { return (InterfaceDataTypeBinary) this.m_Template; } - public String eAIndividualTipText() { - return "Choose the EAIndividual to use."; + public String EAIndividualTipText() { + return "Choose the EA-individual to use."; } /** This method allows you to toggle the problemspecific * initialization method, gives the chance of problem @@ -388,7 +388,7 @@ public class BKnapsackProblem extends AbstractProblemBinary implements java.io.S return this.m_LocalSearch; } public String localSearchTipText() { - return "Gives the chance of local search."; + return "Gives the chance of local search"; } /** This method allows you to toggle the use of Lamarckism. * @param b toggles lamarckism. @@ -400,6 +400,16 @@ public class BKnapsackProblem extends AbstractProblemBinary implements java.io.S return this.m_Lamarckism; } public String lamarckismTipText() { - return "Lamarckism alters the genotype after the local search."; + return "Lamarckism alters the genotype after the local search"; } + + public int getWeightLimit() { + return m_Limit; + } + public void setWeightLimit(int mLimit) { + m_Limit = mLimit; + } + public String weightLimitTipText() { + return "Weight limit for the knapsack problem"; + } } diff --git a/src/eva2/server/go/strategies/IslandModelEA.java b/src/eva2/server/go/strategies/IslandModelEA.java index bcc9c3ba..23ae10de 100644 --- a/src/eva2/server/go/strategies/IslandModelEA.java +++ b/src/eva2/server/go/strategies/IslandModelEA.java @@ -26,7 +26,7 @@ import eva2.tools.jproxy.RMIServer; * evaluation and on the other hand the GUI based distribution scheme is rather prone * to config errors (the correct ssh version is required, the jar needs to be in * the working dir and possible problem data must be on the servers to) an implicit - * island-model has been implemented too to allow fast and reliabel computation. + * island-model has been implemented too to allow fast and reliable computation. * This is still usefull, since it is less prone to premature convergence and also * an heterogenuous island model can be used. *