src/java/m/cfa/baseflow/V1_0.java
| @@ -45,7 +45,7 @@ |
| |
| @Override |
| protected void doProcess() throws Exception { |
| - Executable e = getResourceExe("bf"); // looking up the resource by id. |
| + Executable e = resources().getExe("bf"); // looking up the resource by id. |
| model.run(e); |
| } |
| |
src/java/m/cfa/loadest/V1_0.java
| @@ -46,7 +46,7 @@ |
| |
| @Override |
| protected void doProcess() throws Exception { |
| - Executable e = getResourceExe("ld"); // looking up the resource by id. |
| + Executable e = resources().getExe("ld"); // looking up the resource by id. |
| model.run(e); |
| } |
| |
src/java/m/cfa/timeseries/V1_0.java
| @@ -49,8 +49,8 @@ |
| model.setEnvelopeTF(inputPayload.getBoolean("envelopeTF")); |
| model.setRasterTF(inputPayload.getBoolean("rasterTF")); |
| model.setRasterLogarithmicBinsTF(inputPayload.getBoolean("rasterLogarithmicBinsTF")); |
| - model.setHighPercentile(getDoubleParam("highPercentile")); |
| - model.setLowPercentile(getDoubleParam("lowPercentile")); |
| + model.setHighPercentile(inputPayload.getDouble("highPercentile")); |
| + model.setLowPercentile(inputPayload.getDouble("lowPercentile")); |
| model.setCalcFlowStatisticsFileTF(inputPayload.getBoolean("calcFlowStatisticsFileTF")); |
| model.setShowMonthlyStatsTF(inputPayload.getBoolean("showMonthlyStatsTF")); |
| model.setWaterYear_TF(inputPayload.getBoolean("waterYearTF")); |
| @@ -59,8 +59,8 @@ |
| model.setCDPHE_m(inputPayload.getInt("CDPHE_m")); |
| model.setCDPHE_R(inputPayload.getInt("CDPHE_R")); |
| model.setCDPHE_waterYearBegin(inputPayload.getString("CDPHE_waterYearBegin")); |
| - model.setCDPHE_clusterLength(getIntParam("CDPHE_clusterLength")); |
| - model.setCDPHE_clusterCountMax(getIntParam("CDPHE_clusterCountMax")); |
| + model.setCDPHE_clusterLength(inputPayload.getInt("CDPHE_clusterLength")); |
| + model.setCDPHE_clusterCountMax(inputPayload.getInt("CDPHE_clusterCountMax")); |
| model.setMergeDatasets(inputPayload.getBoolean("merge_datasets")); |
| model.setMergeMethod(inputPayload.getString("merge_method")); |
| model.setUserData(inputPayload.getString("user_data")); |
| @@ -68,7 +68,7 @@ |
| |
| @Override |
| protected void doProcess() throws Exception { |
| - Executable e = getResourceExe("dflow"); |
| + Executable e = resources().getExe("dflow"); |
| model.run(e); |
| } |
| |
src/java/m/cfa/timeseries/guiTimeseries_Model.java
| @@ -363,7 +363,7 @@ |
| for(int i=0; i<data.length; i++){ |
| dataList.add(Double.parseDouble(data[i][1])); |
| } |
| - |
| + |
| //Calculate statistics |
| double temp1 = DoubleMath.round(DoubleMath.max(dataList),3);//Call Max function |
| double temp2 = DoubleMath.round(DoubleMath.min(dataList),3);//Call Min function |