diff --git a/src/eva2/gui/GenericDoubleArrayEditor.java b/src/eva2/gui/GenericDoubleArrayEditor.java index d74d6941..0a5e0852 100644 --- a/src/eva2/gui/GenericDoubleArrayEditor.java +++ b/src/eva2/gui/GenericDoubleArrayEditor.java @@ -38,10 +38,16 @@ class MyFocusListener implements FocusListener { this.arrEditor = gdae; } - @Override + /* + * (non-Javadoc) + * @see java.awt.event.FocusListener#focusLost(java.awt.event.FocusEvent) + */ public void focusLost(FocusEvent e) { } - @Override + /* + * (non-Javadoc) + * @see java.awt.event.FocusListener#focusGained(java.awt.event.FocusEvent) + */ public void focusGained(FocusEvent e) { arrEditor.notifyFocusID(myID);}; }; diff --git a/src/eva2/server/go/problems/AbstractOptimizationProblem.java b/src/eva2/server/go/problems/AbstractOptimizationProblem.java index 76bad71c..a682e1a1 100644 --- a/src/eva2/server/go/problems/AbstractOptimizationProblem.java +++ b/src/eva2/server/go/problems/AbstractOptimizationProblem.java @@ -73,6 +73,9 @@ implements InterfaceOptimizationProblem /*, InterfaceParamControllable*/, Serial } + /** + * + */ public static final String STAT_SOLUTION_HEADER = "solution"; int parallelthreads = 1; @@ -253,11 +256,12 @@ implements InterfaceOptimizationProblem /*, InterfaceParamControllable*/, Serial * @return String */ public String[] getAdditionalFileStringInfo() { - if (this instanceof InterfaceInterestingHistogram) + if (this instanceof InterfaceInterestingHistogram) { return new String[]{"Representation of the current best individual", "Fitness histogram of the current population", "Fitness threshold based score of the current population"}; - else return new String[]{"Representation of the current best individual"}; + } + return new String[]{"Representation of the current best individual"}; } /** This method returns the additional data that is to be written into a file diff --git a/src/eva2/server/go/problems/AbstractProblemDouble.java b/src/eva2/server/go/problems/AbstractProblemDouble.java index bab287ac..d8203cd3 100644 --- a/src/eva2/server/go/problems/AbstractProblemDouble.java +++ b/src/eva2/server/go/problems/AbstractProblemDouble.java @@ -573,6 +573,10 @@ public abstract class AbstractProblemDouble extends AbstractOptimizationProblem return "(De-)Activate constraints for the problem."; } + /* + * (non-Javadoc) + * @see eva2.server.go.problems.AbstractOptimizationProblem#getAdditionalFileStringHeader() + */ @Override public String[] getAdditionalFileStringHeader() { String[] superHeader = super.getAdditionalFileStringHeader(); @@ -583,6 +587,10 @@ public abstract class AbstractProblemDouble extends AbstractOptimizationProblem return superHeader; } + /* + * (non-Javadoc) + * @see eva2.server.go.problems.AbstractOptimizationProblem#getAdditionalFileStringInfo() + */ @Override public String[] getAdditionalFileStringInfo() { String[] superInfo = super.getAdditionalFileStringInfo(); diff --git a/src/eva2/server/stat/AbstractStatistics.java b/src/eva2/server/stat/AbstractStatistics.java index b9bcec48..f37c0469 100644 --- a/src/eva2/server/stat/AbstractStatistics.java +++ b/src/eva2/server/stat/AbstractStatistics.java @@ -150,10 +150,15 @@ public abstract class AbstractStatistics implements InterfaceTextListener, Inter */ private void fireDataListenersStartStop(int runNumber, boolean normal, boolean start) { if (dataListeners!=null) for (InterfaceStatisticsListener l : dataListeners) { - if (start) l.notifyRunStarted(runNumber, m_StatsParams.getMultiRuns(), currentStatHeader, currentStatMetaInfo); - else { - l.notifyRunStopped(optRunsPerformed, normal); - if (optRunsPerformed>1) l.finalMultiRunResults(currentStatHeader, finalObjectData); + if (start) { + l.notifyRunStarted(runNumber, m_StatsParams.getMultiRuns(), + currentStatHeader, currentStatMetaInfo); + } else { + l.notifyRunStopped(optRunsPerformed, normal); + if (optRunsPerformed > 1) { + l.finalMultiRunResults(currentStatHeader, + finalObjectData); + } } } }