| @@ -18,10 +18,12 @@ |
| import javax.ws.rs.Path; |
| import static m.oms.ages.V1_0.KEY_SCRIPT; |
| import ngmf.util.cosu.luca.of.KGE; |
| +import ngmf.util.cosu.luca.of.NS; |
| import ngmf.util.cosu.luca.of.NS2LOG; |
| +import ngmf.util.cosu.luca.of.RMSE; |
| +import ngmf.util.cosu.luca.of.TRMSE; |
| import oms.utils.Utils; |
| import oms3.ObjectiveFunction; |
| -import oms3.util.Statistics; |
| |
| /** |
| * Ages service. |
| @@ -45,12 +47,15 @@ |
| public static final String PAR_STARTTIME = "startTime"; |
| public static final String PAR_ENDTIME = "endTime"; |
| |
| - Map<String, ObjectiveFunction> ofs = new HashMap<>(); |
| + static Map<String, ObjectiveFunction> ofs = new HashMap<>(); |
| |
| |
| - { |
| + static { |
| ofs.put("kge", new KGE()); |
| + ofs.put("ns", new NS()); |
| ofs.put("nslog", new NS2LOG()); |
| + ofs.put("rmse", new RMSE()); |
| + ofs.put("trmse", new TRMSE()); |
| } |
| |
| |
| @@ -99,7 +104,8 @@ |
| } |
| |
| |
| - private double calc_of(ObjectiveFunction of, String obs, String sim, String start, String end) throws IOException, ServiceException { |
| + private double calc_of(ObjectiveFunction of, String obs, |
| + String sim, String start, String end) throws IOException, ServiceException { |
| // e.g. obs_data02_14.csv/obs/orun[1] |
| double[] obsData = Utils.getData(obs, getWorkspaceDir(), start, end); |
| // e.g. output/csip_run/out/Outlet.csv/output/catchmentSimRunoff |
| @@ -1,5 +1,5 @@ |
| { |
| - "csip.context.version": "$version: 0.1.24 a0856fce818e 2020-03-01 od, built at 2020-03-02 17:17 by od$", |
| + "csip.context.version": "$version: 0.1.25 e3d9d0de4486 2020-03-02 od, built at 2020-03-04 10:53 by od$", |
| "oms.java.home": "/opt/jdk1.8.0_51", |
| "csip.keepworkspace": false, |
| "csip.session.ttl": "PT10S", |