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

Minor changes to StatisticsDummy, merging mk branch rev 126:127

Browse Source
This commit is contained in:
Marcel Kronfeld 2008-07-30 14:59:35 +00:00
parent c25ca2ebaa
commit ad67392637
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -409,7 +409,14 @@ public abstract class AbstractStatistics implements InterfaceTextListener, Inter
for (int i=0; i<mean.length; i++) mean[i] += fit[i]; for (int i=0; i<mean.length; i++) mean[i] += fit[i];
} }
private boolean secondIsBetter(IndividualInterface indy1, IndividualInterface indy2) { /**
* Compare two individual interfaces and return true if the second one is dominant.
*
* @param indy1
* @param indy2
* @return true if the second individual is dominant, else false
*/
public static boolean secondIsBetter(IndividualInterface indy1, IndividualInterface indy2) {
if (indy1 == null) return true; if (indy1 == null) return true;
if (indy2 == null) return false; if (indy2 == null) return false;
if (indy1 instanceof AbstractEAIndividual) return ((AbstractEAIndividual)indy2).isDominatingDebConstraints((AbstractEAIndividual)indy1); if (indy1 instanceof AbstractEAIndividual) return ((AbstractEAIndividual)indy2).isDominatingDebConstraints((AbstractEAIndividual)indy1);

21
src/eva2/server/stat/StatisticsDummy.java
View File

@ -2,6 +2,7 @@ package eva2.server.stat;
import eva2.server.go.IndividualInterface; import eva2.server.go.IndividualInterface;
import eva2.server.go.PopulationInterface; import eva2.server.go.PopulationInterface;
import eva2.server.go.individuals.AbstractEAIndividual;
import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; import eva2.server.go.problems.InterfaceAdditionalPopulationInformer;
/** /**
@ -14,13 +15,16 @@ import eva2.server.go.problems.InterfaceAdditionalPopulationInformer;
public class StatisticsDummy implements InterfaceStatistics, InterfaceTextListener { public class StatisticsDummy implements InterfaceStatistics, InterfaceTextListener {
boolean consoleOut = false; boolean consoleOut = false;
StatsParameter sParams = null; StatsParameter sParams = null;
AbstractEAIndividual bestCurrentIndividual, bestIndividualAllover;
public StatisticsDummy() { public StatisticsDummy() {
bestIndividualAllover = null;
sParams = new StatsParameter(); sParams = new StatsParameter();
sParams.setOutputVerbosityK(StatsParameter.VERBOSITY_NONE); sParams.setOutputVerbosityK(StatsParameter.VERBOSITY_NONE);
} }
public StatisticsDummy(boolean doConsoleOut) { public StatisticsDummy(boolean doConsoleOut) {
bestIndividualAllover = null;
sParams = new StatsParameter(); sParams = new StatsParameter();
sParams.setOutputVerbosityK(StatsParameter.VERBOSITY_NONE); sParams.setOutputVerbosityK(StatsParameter.VERBOSITY_NONE);
consoleOut = doConsoleOut; consoleOut = doConsoleOut;
@ -30,8 +34,12 @@ public class StatisticsDummy implements InterfaceStatistics, InterfaceTextListen
System.err.println("addTextListener not provided!"); System.err.println("addTextListener not provided!");
} }
public void createNextGenerationPerformed(PopulationInterface Pop, public void createNextGenerationPerformed(PopulationInterface pop,
InterfaceAdditionalPopulationInformer informer) { InterfaceAdditionalPopulationInformer informer) {
bestCurrentIndividual = (AbstractEAIndividual)pop.getBestIndividual();
if ((bestIndividualAllover == null) || (AbstractStatistics.secondIsBetter(bestIndividualAllover, bestCurrentIndividual))) {
bestIndividualAllover = bestCurrentIndividual;
}
} }
public void createNextGenerationPerformed(double[] bestfit, public void createNextGenerationPerformed(double[] bestfit,
@ -39,13 +47,12 @@ public class StatisticsDummy implements InterfaceStatistics, InterfaceTextListen
} }
public double[] getBestFitness() { public double[] getBestFitness() {
System.err.println("getBestFitness not provided!"); if (bestIndividualAllover != null) return bestCurrentIndividual.getFitness();
return null; else return null;
} }
public IndividualInterface getBestSolution() { public IndividualInterface getBestSolution() {
System.err.println("getBestSolution not provided!"); return bestIndividualAllover;
return null;
} }
public InterfaceStatisticsParameter getStatisticsParameter() { public InterfaceStatisticsParameter getStatisticsParameter() {
@ -62,7 +69,9 @@ public class StatisticsDummy implements InterfaceStatistics, InterfaceTextListen
} }
public void startOptPerformed(String InfoString, int runnumber, public void startOptPerformed(String InfoString, int runnumber,
Object params) {} Object params) {
bestIndividualAllover = null;
}
public void stopOptPerformed(boolean normal, String stopMessage) {} public void stopOptPerformed(boolean normal, String stopMessage) {}