src/java/m/oms/ages/V1_0.java
| @@ -51,6 +51,9 @@ |
| public static final String PAR_STARTTIME = "startTime"; |
| public static final String PAR_ENDTIME = "endTime"; |
| |
| + public static final String CAL_STARTTIME = "cal_startTime"; |
| + public static final String CAL_ENDTIME = "cal_endTime"; |
| + |
| static final Map<String, ObjectiveFunction> OF = new HashMap<>(); |
| |
| static { |
| @@ -211,6 +214,10 @@ |
| String start = parameter().getString(PAR_STARTTIME); |
| String end = parameter().getString(PAR_ENDTIME); |
| |
| + // optional parameter |
| + String cal_start = parameter().getString(CAL_STARTTIME, start); |
| + String cal_end = parameter().getString(CAL_ENDTIME, end); |
| + |
| File d = new File(dsl); |
| if (!(d.isAbsolute() && d.exists())) { |
| d = getWorkspaceFile(dsl); |
| @@ -223,7 +230,7 @@ |
| |
| for (String ofName : getRequestedObjfunc(OF.keySet())) { |
| String[] data = parameter().getStringArray(ofName); |
| - double v = calc_of(OF.get(ofName), data[0], data[1], start, end); |
| + double v = calc_of(OF.get(ofName), data[0], data[1], cal_start, cal_end); |
| results().put(ofName, v); |
| } |
| // results().put(getWorkspaceFile("output")); |