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

Cosmetics.

Browse Source
This commit is contained in:
Marcel Kronfeld 2008-06-24 15:08:24 +00:00
parent 1baa61018e
commit a6c3d65bce
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -829,6 +829,7 @@ public abstract class AbstractEAIndividual implements IndividualInterface, java.
* @return * @return
*/ */
public static String getDefaultDataString(IndividualInterface individual, String separator) { public static String getDefaultDataString(IndividualInterface individual, String separator) {
if (individual == null) return "null";
StringBuffer sb = new StringBuffer(""); StringBuffer sb = new StringBuffer("");
char left = '['; char left = '[';
char right = ']'; char right = ']';

16
src/eva2/server/stat/AbstractStatistics.java
View File

@ -48,7 +48,7 @@ public abstract class AbstractStatistics implements InterfaceTextListener, Inter
protected double[] currentBestFit; protected double[] currentBestFit;
protected double[] meanFitness; protected double[] meanFitness;
protected double[] currentWorstFit; protected double[] currentWorstFit;
protected IndividualInterface bestCurrentIndividual, bestIndivdualAllover; protected IndividualInterface bestCurrentIndividual, bestIndividualAllover;
private ArrayList<InterfaceTextListener> textListeners; private ArrayList<InterfaceTextListener> textListeners;
@ -119,7 +119,7 @@ public abstract class AbstractStatistics implements InterfaceTextListener, Inter
if (saveParams) m_StatsParams.saveInstance(); if (saveParams) m_StatsParams.saveInstance();
initOutput(infoString); initOutput(infoString);
bestCurrentIndividual = null; bestCurrentIndividual = null;
bestIndivdualAllover = null; bestIndividualAllover = null;
if (refineMultiRuns) meanCollection = new ArrayList<double[][]>(); if (refineMultiRuns) meanCollection = new ArrayList<double[][]>();
else meanCollection = null; else meanCollection = null;
} }
@ -161,9 +161,9 @@ public abstract class AbstractStatistics implements InterfaceTextListener, Inter
protected void finalizeOutput() { protected void finalizeOutput() {
if (printFinalVerbosity()) printToTextListener("*******\n Runs performed: " + optRunsPerformed + ", reached target " + convergenceCnt + " times with threshold " + m_StatsParams.getConvergenceRateThreshold() + ", rate " + convergenceCnt/(double)m_StatsParams.getMultiRuns() + '\n'); if (printFinalVerbosity()) printToTextListener("*******\n Runs performed: " + optRunsPerformed + ", reached target " + convergenceCnt + " times with threshold " + m_StatsParams.getConvergenceRateThreshold() + ", rate " + convergenceCnt/(double)m_StatsParams.getMultiRuns() + '\n');
if (printFinalVerbosity()) printToTextListener("Best overall individual: " + BeanInspector.toString(bestIndivdualAllover) + '\n'); if (printFinalVerbosity() && (bestIndividualAllover != null)) printToTextListener("Best overall individual: " + BeanInspector.toString(bestIndividualAllover) + '\n');
if (printFinalVerbosity()) printToTextListener(" solution : " + AbstractEAIndividual.getDefaultDataString(bestIndivdualAllover) + '\n'); if (printFinalVerbosity() && (bestIndividualAllover != null)) printToTextListener(" solution : " + AbstractEAIndividual.getDefaultDataString(bestIndividualAllover) + '\n');
if (printFinalVerbosity()) printToTextListener(" fitness : " + BeanInspector.toString(bestIndivdualAllover.getFitness()) + '\n'); if (printFinalVerbosity() && (bestIndividualAllover != null)) printToTextListener(" fitness : " + BeanInspector.toString(bestIndividualAllover.getFitness()) + '\n');
if (refineMultiRuns && (optRunsPerformed>1) && (meanCollection != null)) { if (refineMultiRuns && (optRunsPerformed>1) && (meanCollection != null)) {
if (printFinalVerbosity()) printToTextListener("Averaged performance:\n"); if (printFinalVerbosity()) printToTextListener("Averaged performance:\n");
for (int i=0; i<meanCollection.size(); i++) divideMean(meanCollection.get(i), optRunsPerformed); for (int i=0; i<meanCollection.size(); i++) divideMean(meanCollection.get(i), optRunsPerformed);
@ -315,8 +315,8 @@ public abstract class AbstractStatistics implements InterfaceTextListener, Inter
} }
// by default plotting only the best // by default plotting only the best
bestCurrentIndividual = pop.getBestIndividual().getClone(); bestCurrentIndividual = pop.getBestIndividual().getClone();
if ((bestIndivdualAllover == null) || (secondIsBetter(bestIndivdualAllover, bestCurrentIndividual))) { if ((bestIndividualAllover == null) || (secondIsBetter(bestIndividualAllover, bestCurrentIndividual))) {
bestIndivdualAllover = bestCurrentIndividual; bestIndividualAllover = bestCurrentIndividual;
// printToTextListener("new best found!, last was " + BeanInspector.toString(bestIndivdualAllover) + "\n"); // printToTextListener("new best found!, last was " + BeanInspector.toString(bestIndivdualAllover) + "\n");
} }
@ -413,7 +413,7 @@ public abstract class AbstractStatistics implements InterfaceTextListener, Inter
} }
public IndividualInterface getBestSolution() { public IndividualInterface getBestSolution() {
return bestIndivdualAllover; return bestIndividualAllover;
} }
public int getFitnessCalls() { public int getFitnessCalls() {