diff --git a/src/eva2/EvAInfo.java b/src/eva2/EvAInfo.java index be568d16..155fef82 100644 --- a/src/eva2/EvAInfo.java +++ b/src/eva2/EvAInfo.java @@ -29,7 +29,7 @@ package eva2; public class EvAInfo { public static final String productName = "EvA 2"; public static final String productLongName = "Evolutionary Algorithms Workbench 2"; - public static final String versionNum = new String ("2.028"); + public static final String versionNum = new String ("2.029"); public static final String url = "http://www.ra.cs.uni-tuebingen.de/software/EvA2"; public static final String propertyFile = "resources/EvA2.props"; diff --git a/src/eva2/server/go/populations/Population.java b/src/eva2/server/go/populations/Population.java index 842bc72d..e877c29e 100644 --- a/src/eva2/server/go/populations/Population.java +++ b/src/eva2/server/go/populations/Population.java @@ -938,7 +938,7 @@ public class Population extends ArrayList implements PopulationInterface, Clonea Pair hashes = getIndyHashSums(); if (evaluationTimeHashes == null) return false; - else return (hashes.head()==evaluationTimeHashes.head() && (hashes.tail() == evaluationTimeHashes.tail()) && (evaluationTimeModCount == modCount)); + else return ((hashes.head().equals(evaluationTimeHashes.head())) && (hashes.tail().equals(evaluationTimeHashes.tail())) && (evaluationTimeModCount == modCount)); } /** diff --git a/src/eva2/server/go/problems/AbstractOptimizationProblem.java b/src/eva2/server/go/problems/AbstractOptimizationProblem.java index fd8644c1..3f773a9c 100644 --- a/src/eva2/server/go/problems/AbstractOptimizationProblem.java +++ b/src/eva2/server/go/problems/AbstractOptimizationProblem.java @@ -54,7 +54,7 @@ public abstract class AbstractOptimizationProblem implements InterfaceOptimizati AbstractEAIndividual tmpIndy; if (population.isEvaluated()) { - System.err.println("Population evaluation seems not required!"); +// System.err.println("Population evaluation seems not required!"); } else { // @todo This is the position to implement a granular // @todo paralliziation scheme diff --git a/src/eva2/tools/Pair.java b/src/eva2/tools/Pair.java index 52a87c49..355f83b9 100644 --- a/src/eva2/tools/Pair.java +++ b/src/eva2/tools/Pair.java @@ -36,4 +36,8 @@ public class Pair implements Serializable { public T tail() { return tail; } + + public String toString() { + return "(" + head.toString() + "," + tail.toString()+")"; + } } \ No newline at end of file diff --git a/src/eva2/tools/SelectedTag.java b/src/eva2/tools/SelectedTag.java index a7262ee7..d9b7fc66 100644 --- a/src/eva2/tools/SelectedTag.java +++ b/src/eva2/tools/SelectedTag.java @@ -31,8 +31,8 @@ public class SelectedTag implements java.io.Serializable { * @param selID * @param tagStrings */ - public SelectedTag(int selID, String[] tagStrings) { - init(selID, tagStrings); + public SelectedTag(int selID, String ... strings) { + init(selID, strings); } /**