| @@ -81,13 +81,11 @@ |
| |
| public static final String PAYLOAD = "payload"; |
| public static final String PROJECT = "project"; |
| - public static final String MULTI_OBJ = "multi_obj"; |
| |
| static final Map<String, ObjectiveFunction> OF = new HashMap<>(); |
| |
| public String data_folder = ""; |
| boolean payLoad = false; |
| - boolean multi_obj = false; |
| |
| static { |
| OF.put("kge", new KGE()); |
| @@ -240,7 +238,6 @@ |
| LOG.info("===> Running AgES "); |
| |
| payLoad = parameter().getBoolean(PAYLOAD, false); |
| - multi_obj = parameter().getBoolean(MULTI_OBJ, false); |
| |
| String project = parameter().getString(PROJECT, "SFIR3"); |
| String dsl = parameter().getString(KEY_SCRIPT, |
| @@ -313,33 +310,12 @@ |
| |
| Utils.runAges(d, getWorkspaceDir(), parameter(), resources(), LOG); |
| |
| - if (!multi_obj) { |
| - LOG.info("===> NOT Multi OBJ "); |
| - for (String ofName : getRequestedObjfunc(OF.keySet())) { |
| - if (parameter().has(ofName)) { |
| - String[] data = parameter().getStringArray(ofName); |
| - double v = calc_of(OF.get(ofName), data[0], data[1], cal_start, cal_end); |
| - results().put(ofName, v); |
| - } |
| - } |
| - } |
| - |
| - if (multi_obj) { |
| - LOG.info("===> Multi OBJ"); |
| + for (String namee : parameter().getNames()) { |
| for (String ofNameM : getRequestedObjfunc(OF.keySet())) { |
| - boolean find = true; |
| - int count = 1; |
| - while (find) { |
| - String dynamic = "_" + count; |
| - String new_Name = ofNameM + "" + dynamic; |
| - if (parameter().has(new_Name)) { |
| - String[] dataM = parameter().getStringArray(new_Name); |
| - double vv = calc_of(OF.get(ofNameM), dataM[0], dataM[1], cal_start, cal_end); |
| - results().put(new_Name, vv); |
| - count++; |
| - } else { |
| - find = false; |
| - } |
| + if (namee.toLowerCase().startsWith(ofNameM) || namee.equals(ofNameM)) { |
| + String[] data = parameter().getStringArray(namee); |
| + double v = calc_of(OF.get(ofNameM), data[0], data[1], cal_start, cal_end); |
| + results().put(namee, v); |
| } |
| } |
| } |