From 1b4f07edb336d4bcfb81b26c31d5703656d24e97 Mon Sep 17 00:00:00 2001 From: Marcel Kronfeld Date: Thu, 5 May 2011 13:07:06 +0000 Subject: [PATCH] Minor tweaks --- src/eva2/server/go/strategies/CBNPSO.java | 8 ++++++++ src/eva2/server/stat/EvAJobList.java | 8 +++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/eva2/server/go/strategies/CBNPSO.java b/src/eva2/server/go/strategies/CBNPSO.java index 6f60907c..c4790715 100644 --- a/src/eva2/server/go/strategies/CBNPSO.java +++ b/src/eva2/server/go/strategies/CBNPSO.java @@ -195,6 +195,14 @@ public class CBNPSO extends ClusterBasedNichingEA implements Serializable { 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) * or -1 if this does not apply. diff --git a/src/eva2/server/stat/EvAJobList.java b/src/eva2/server/stat/EvAJobList.java index 19347d52..3932193f 100644 --- a/src/eva2/server/stat/EvAJobList.java +++ b/src/eva2/server/stat/EvAJobList.java @@ -120,9 +120,11 @@ public class EvAJobList extends PropertySelectableList implements Serial File sFile = fc.getSelectedFile(); if (sFile.exists()) { for (EvAJob job : selected) { - if (!FileTools.saveObjectToFolder(job, sFile, false, parentComponent)) { - System.err.println("Error on saving jobs..."); - return false; + if (job!=null) { + if (!FileTools.saveObjectToFolder(job, sFile, false, parentComponent)) { + System.err.println("Error on saving jobs..."); + return false; + } } } } else return false; // invalid folder chosen