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

Merging mk branch changes from rev 185, minor cleanup.

Browse Source
This commit is contained in:
Marcel Kronfeld
2008-09-05 13:03:27 +00:00
parent 29c655f874
commit ee67276827
4 changed files with 60 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/eva2/gui/FunctionArea.java
View File

@@ -115,6 +115,13 @@ public class FunctionArea extends DArea implements Serializable {
drawCircle(c+""+val, position, graphID);
}
public void drawCircle(String label, double xPos, double yPos, int graphID) {
double[] pos = new double[2];
pos[0]=xPos;
pos[1]=yPos;
drawCircle(label, pos, graphID);
}
/**
* Plot a circle icon to the function area which is annotated with a char and
* a double value. The color corresponds to the color of the graph with given ID

7
src/eva2/server/go/individuals/AbstractEAIndividual.java
View File

@@ -763,7 +763,12 @@ public abstract class AbstractEAIndividual implements IndividualInterface, java.
// if (name.equalsIgnoreCase("Fitness")) return this.getFitness();
// if (name.equalsIgnoreCase("FitnessArray")) return this.getFitness();
Object data = m_dataHash.get(name);
if (data==null) System.err.println("Warning: data key " + name + " unknown!");
if (data==null) { // Fitness is actually in use... so lets have a minor special treatment
if (name.compareToIgnoreCase("Fitness")==0) data = getFitness();
else {
EVAERROR.errorMsgOnce("Warning: data key " + name + " unknown (pot. multiple errors)!");
}
}
return data;
}

8
src/eva2/server/go/operators/selection/probability/InterfaceSelectionProbability.java
View File

@@ -3,9 +3,9 @@ package eva2.server.go.operators.selection.probability;
import eva2.server.go.populations.Population;
/** The interface for methods with calculate the selection
* propability from the fitness values. While the fitness
* probability from the fitness values. While the fitness
* is typically to be minimized the selection probability
* is within [0,1] summs up to one and is to be maximizes.
* is within [0,1] sums up to one and is to be maximizes.
* Created by IntelliJ IDEA.
* User: streiche
* Date: 30.03.2004
@@ -22,7 +22,7 @@ public interface InterfaceSelectionProbability {
/** This method computes the selection probability for each individual
* in the population. Note: Summed over the complete population the selection
* probability sums up to one.
* probability gives one.
* @param population The population to compute.
* @param input The name of the input.
*/
@@ -30,7 +30,7 @@ public interface InterfaceSelectionProbability {
/** This method computes the selection probability for each individual
* in the population. Note: Summed over the complete population the selection
* probability sums up to one.
* probability gives one.
* @param population The population to compute.
* @param input The name of the input.
*/