minor cosmetics merge from mk rev 139
This commit is contained in:
		@@ -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";
 | 
			
		||||
 
 | 
			
		||||
@@ -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));
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	/**
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -36,4 +36,8 @@ public class Pair<S, T> implements Serializable {
 | 
			
		||||
	public T tail() {
 | 
			
		||||
		return tail;
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	public String toString() {
 | 
			
		||||
		return "(" + head.toString() + "," + tail.toString()+")";
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -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);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	/**
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user