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

Minor tweaks

Browse Source
This commit is contained in:
Marcel Kronfeld 2011-05-05 13:07:06 +00:00
parent eb1c33549b
commit 1b4f07edb3
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/eva2/server/go/strategies/CBNPSO.java
View File

@ -195,6 +195,14 @@ public class CBNPSO extends ClusterBasedNichingEA implements Serializable {
return ToolBox.appendArrays(super.getAdditionalDataHeader(), addVals); return ToolBox.appendArrays(super.getAdditionalDataHeader(), addVals);
} }
@Override
public String[] getAdditionalDataInfo() {
String[] addVals = {"Ratio of interesting solutions within all archived solutions"};
if (getCurrentPeriod()>=0) addVals = new String[]{"Ratio of interesting solutions within all archived solutions",
"Current sigma adaptation period"};
return ToolBox.appendArrays(super.getAdditionalDataInfo(), addVals);
}
/** /**
* Retrieve the current period of the sinusoidal sigma adaption (in case it is controlled by a threshold adaption) * Retrieve the current period of the sinusoidal sigma adaption (in case it is controlled by a threshold adaption)
* or -1 if this does not apply. * or -1 if this does not apply.

8
src/eva2/server/stat/EvAJobList.java
View File

@ -120,9 +120,11 @@ public class EvAJobList extends PropertySelectableList<EvAJob> implements Serial
File sFile = fc.getSelectedFile(); File sFile = fc.getSelectedFile();
if (sFile.exists()) { if (sFile.exists()) {
for (EvAJob job : selected) { for (EvAJob job : selected) {
if (!FileTools.saveObjectToFolder(job, sFile, false, parentComponent)) { if (job!=null) {
System.err.println("Error on saving jobs..."); if (!FileTools.saveObjectToFolder(job, sFile, false, parentComponent)) {
return false; System.err.println("Error on saving jobs...");
return false;
}
} }
} }
} else return false; // invalid folder chosen } else return false; // invalid folder chosen