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

Removed unnecessary @override tags that cause problems in J1.5.

Browse Source
This commit is contained in:
Andreas Dräger 2010-09-29 07:22:10 +00:00
parent e57a2eaea2
commit 170c92046d
4 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/eva2/gui/GenericDoubleArrayEditor.java
View File

@ -38,10 +38,16 @@ class MyFocusListener implements FocusListener {
this.arrEditor = gdae; this.arrEditor = gdae;
} }
@Override /*
* (non-Javadoc)
* @see java.awt.event.FocusListener#focusLost(java.awt.event.FocusEvent)
*/
public void focusLost(FocusEvent e) { } 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);}; public void focusGained(FocusEvent e) { arrEditor.notifyFocusID(myID);};
}; };

8
src/eva2/server/go/problems/AbstractOptimizationProblem.java
View File

@ -73,6 +73,9 @@ implements InterfaceOptimizationProblem /*, InterfaceParamControllable*/, Serial
} }
/**
*
*/
public static final String STAT_SOLUTION_HEADER = "solution"; public static final String STAT_SOLUTION_HEADER = "solution";
int parallelthreads = 1; int parallelthreads = 1;
@ -253,11 +256,12 @@ implements InterfaceOptimizationProblem /*, InterfaceParamControllable*/, Serial
* @return String * @return String
*/ */
public String[] getAdditionalFileStringInfo() { public String[] getAdditionalFileStringInfo() {
if (this instanceof InterfaceInterestingHistogram) if (this instanceof InterfaceInterestingHistogram) {
return new String[]{"Representation of the current best individual", return new String[]{"Representation of the current best individual",
"Fitness histogram of the current population", "Fitness histogram of the current population",
"Fitness threshold based score 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 /** This method returns the additional data that is to be written into a file

8
src/eva2/server/go/problems/AbstractProblemDouble.java
View File

@ -573,6 +573,10 @@ public abstract class AbstractProblemDouble extends AbstractOptimizationProblem
return "(De-)Activate constraints for the problem."; return "(De-)Activate constraints for the problem.";
} }
/*
* (non-Javadoc)
* @see eva2.server.go.problems.AbstractOptimizationProblem#getAdditionalFileStringHeader()
*/
@Override @Override
public String[] getAdditionalFileStringHeader() { public String[] getAdditionalFileStringHeader() {
String[] superHeader = super.getAdditionalFileStringHeader(); String[] superHeader = super.getAdditionalFileStringHeader();
@ -583,6 +587,10 @@ public abstract class AbstractProblemDouble extends AbstractOptimizationProblem
return superHeader; return superHeader;
} }
/*
* (non-Javadoc)
* @see eva2.server.go.problems.AbstractOptimizationProblem#getAdditionalFileStringInfo()
*/
@Override @Override
public String[] getAdditionalFileStringInfo() { public String[] getAdditionalFileStringInfo() {
String[] superInfo = super.getAdditionalFileStringInfo(); String[] superInfo = super.getAdditionalFileStringInfo();

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

@ -150,10 +150,15 @@ public abstract class AbstractStatistics implements InterfaceTextListener, Inter
*/ */
private void fireDataListenersStartStop(int runNumber, boolean normal, boolean start) { private void fireDataListenersStartStop(int runNumber, boolean normal, boolean start) {
if (dataListeners!=null) for (InterfaceStatisticsListener l : dataListeners) { if (dataListeners!=null) for (InterfaceStatisticsListener l : dataListeners) {
if (start) l.notifyRunStarted(runNumber, m_StatsParams.getMultiRuns(), currentStatHeader, currentStatMetaInfo); if (start) {
else { l.notifyRunStarted(runNumber, m_StatsParams.getMultiRuns(),
currentStatHeader, currentStatMetaInfo);
} else {
l.notifyRunStopped(optRunsPerformed, normal); l.notifyRunStopped(optRunsPerformed, normal);
if (optRunsPerformed>1) l.finalMultiRunResults(currentStatHeader, finalObjectData); if (optRunsPerformed > 1) {
l.finalMultiRunResults(currentStatHeader,
finalObjectData);
}
} }
} }
} }