halfdan/eva2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

minor cosmetics merge from mk rev 139

Browse Source
This commit is contained in:
Marcel Kronfeld 2008-08-06 11:51:59 +00:00
parent 18f3cb8620
commit 72c83a3c77
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/eva2/EvAInfo.java
View File

@ -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";

2
src/eva2/server/go/populations/Population.java
View File

@ -938,7 +938,7 @@ public class Population extends ArrayList implements PopulationInterface, Clonea
Pair<Integer,Integer> 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));
}
/**

2
src/eva2/server/go/problems/AbstractOptimizationProblem.java
View File

@ -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

4
src/eva2/tools/Pair.java
View File

@ -36,4 +36,8 @@ public class Pair<S, T> implements Serializable {
public T tail() {
return tail;
}
public String toString() {
return "(" + head.toString() + "," + tail.toString()+")";
}
}

4
src/eva2/tools/SelectedTag.java
View File

@ -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);
}
/**