@@ -65,25 +65,25 @@ |
putResult("baseflow_results", model.getBaseflow_out().getName()); |
putResult("graph", model.getGraph()); |
//Get BFLOW stream flow stats |
- putResult("streamflow_max", model.getBFLOWstream_Max()); |
- putResult("streamflow_min", model.getBFLOWstream_Min()); |
- putResult("streamflow_median", model.getBFLOWstream_Median()); |
- putResult("streamflow_mean", model.getBFLOWstream_Mean()); |
+ putResult("streamflow_max", model.getBFLOWstream_Max(), null, "cfs"); |
+ putResult("streamflow_min", model.getBFLOWstream_Min(), null, "cfs"); |
+ putResult("streamflow_median", model.getBFLOWstream_Median(), null, "cfs"); |
+ putResult("streamflow_mean", model.getBFLOWstream_Mean(), null, "cfs"); |
//Get BFLOW pass 1 stats |
- putResult("bflowPass1_max", model.getBFLOWpass1_Max()); |
- putResult("bflowPass1_min", model.getBFLOWpass1_Min()); |
- putResult("bflowPass1_median", model.getBFLOWpass1_Median()); |
- putResult("bflowPass1_mean", model.getBFLOWpass1_Mean()); |
+ putResult("bflowPass1_max", model.getBFLOWpass1_Max(), null, "cfs"); |
+ putResult("bflowPass1_min", model.getBFLOWpass1_Min(), null, "cfs"); |
+ putResult("bflowPass1_median", model.getBFLOWpass1_Median(), null, "cfs"); |
+ putResult("bflowPass1_mean", model.getBFLOWpass1_Mean(), null, "cfs"); |
//Get BFLOW pass 2 stats |
- putResult("bflowPass2_max", model.getBFLOWpass2_Max()); |
- putResult("bflowPass2_min", model.getBFLOWpass2_Min()); |
- putResult("bflowPass2_median", model.getBFLOWpass2_Median()); |
- putResult("bflowPass2_mean", model.getBFLOWpass2_Mean()); |
+ putResult("bflowPass2_max", model.getBFLOWpass2_Max(), null, "cfs"); |
+ putResult("bflowPass2_min", model.getBFLOWpass2_Min(), null, "cfs"); |
+ putResult("bflowPass2_median", model.getBFLOWpass2_Median(), null, "cfs"); |
+ putResult("bflowPass2_mean", model.getBFLOWpass2_Mean(), null, "cfs"); |
//Get BFLOW pass 3 stats |
- putResult("bflowPass3_max", model.getBFLOWpass3_Max()); |
- putResult("bflowPass3_min", model.getBFLOWpass3_Min()); |
- putResult("bflowPass3_median", model.getBFLOWpass3_Median()); |
- putResult("bflowPass3_mean", model.getBFLOWpass3_Mean()); |
+ putResult("bflowPass3_max", model.getBFLOWpass3_Max(), null, "cfs"); |
+ putResult("bflowPass3_min", model.getBFLOWpass3_Min(), null, "cfs"); |
+ putResult("bflowPass3_median", model.getBFLOWpass3_Median(), null, "cfs"); |
+ putResult("bflowPass3_mean", model.getBFLOWpass3_Mean(), null, "cfs"); |
|
//Get result files for JSHighCharts |
String graphDataFiles = model.getTimeseriesOutput().getName(); |
@@ -78,29 +78,29 @@ |
putResult("end", model.getEnd()); |
putResult("data_source", model.getDataSource()); |
//Daily Data |
- putResult("daily_max", model.getDailyMax()); |
- putResult("daily_min", model.getDailyMin()); |
- putResult("daily_upper_quartile", model.getDailyUpperQuartile()); |
- putResult("daily_lower_quartile", model.getDailyLowerQuartile()); |
- putResult("daily_median", model.getDailyMedian()); |
- putResult("daily_mean", model.getDailyMean()); |
- putResult("daily_standard_deviation", model.getDailyStandardDeviation()); |
+ putResult("daily_max", model.getDailyMax(), null, "cfs"); |
+ putResult("daily_min", model.getDailyMin(), null, "cfs"); |
+ putResult("daily_upper_quartile", model.getDailyUpperQuartile(), null, "cfs"); |
+ putResult("daily_lower_quartile", model.getDailyLowerQuartile(), null, "cfs"); |
+ putResult("daily_median", model.getDailyMedian(), null, "cfs"); |
+ putResult("daily_mean", model.getDailyMean(), null, "cfs"); |
+ putResult("daily_standard_deviation", model.getDailyStandardDeviation(), null, "cfs"); |
//Monthly Data |
- putResult("monthly_max", model.getMonthlyMax()); |
- putResult("monthly_min", model.getMonthlyMin()); |
- putResult("monthly_upper_quartile", model.getMonthlyUpperQuartile()); |
- putResult("monthly_lower_quartile", model.getMonthlyLowerQuartile()); |
- putResult("monthly_median", model.getMonthlyMedian()); |
- putResult("monthly_mean", model.getMonthlyMean()); |
- putResult("monthly_standard_deviation", model.getMonthlyStandardDeviation()); |
+ putResult("monthly_max", model.getMonthlyMax(), null, "cfs"); |
+ putResult("monthly_min", model.getMonthlyMin(), null, "cfs"); |
+ putResult("monthly_upper_quartile", model.getMonthlyUpperQuartile(), null, "cfs"); |
+ putResult("monthly_lower_quartile", model.getMonthlyLowerQuartile(), null, "cfs"); |
+ putResult("monthly_median", model.getMonthlyMedian(), null, "cfs"); |
+ putResult("monthly_mean", model.getMonthlyMean(), null, "cfs"); |
+ putResult("monthly_standard_deviation", model.getMonthlyStandardDeviation(), null, "cfs"); |
//Yearly Data |
- putResult("yearly_max", model.getYearlyMax()); |
- putResult("yearly_min", model.getYearlyMin()); |
- putResult("yearly_upper_quartile", model.getYearlyUpperQuartile()); |
- putResult("yearly_lower_quartile", model.getYearlyLowerQuartile()); |
- putResult("yearly_median", model.getYearlyMedian()); |
- putResult("yearly_mean", model.getYearlyMean()); |
- putResult("yearly_standard_deviation", model.getYearlyStandardDeviation()); |
+ putResult("yearly_max", model.getYearlyMax(), null, "cfs"); |
+ putResult("yearly_min", model.getYearlyMin(), null, "cfs"); |
+ putResult("yearly_upper_quartile", model.getYearlyUpperQuartile(), null, "cfs"); |
+ putResult("yearly_lower_quartile", model.getYearlyLowerQuartile(), null, "cfs"); |
+ putResult("yearly_median", model.getYearlyMedian(), null, "cfs"); |
+ putResult("yearly_mean", model.getYearlyMean(), null, "cfs"); |
+ putResult("yearly_standard_deviation", model.getYearlyStandardDeviation(), null, "cfs"); |
//Get other results |
putResult("user_resultFile1", model.getOutputResult1().getName()); |
putResult("user_resultFile2", model.getOutputResult2().getName()); |
@@ -1,17 +1,12 @@ |
package m.cfa; |
|
import cfa.guiTimeseries_Model; |
-import java.util.Map; |
-import java.util.concurrent.Callable; |
+import csip.ModelDataService; |
+import java.io.File; |
import javax.ws.rs.Path; |
import oms3.annotations.Description; |
import oms3.annotations.Name; |
import oms3.annotations.VersionInfo; |
-import org.codehaus.jettison.json.*; |
-import csip.utils.JSONUtils; |
-import csip.ModelDataService; |
-import csip.utils.Services; |
-import java.io.File; |
|
@Name("timeseries") |
@Description("timeseries") |
@@ -108,69 +103,69 @@ |
putResult("units", model.getUnits()); |
putResult("data_source", model.getDataSource()); |
//Get CDPHE low flow results |
- putResult("cdphe_extremeValueDFLOW", model.getCDPHE_ExtremeValueDFLOW()); |
- putResult("cdphe_biologicalDFLOW_all", model.getCDPHE_BiologicalDFLOW_all()); |
- putResult("cdphe_biologicalDFLOW_jan", model.getCDPHE_BiologicalDFLOW_jan()); |
- putResult("cdphe_biologicalDFLOW_feb", model.getCDPHE_BiologicalDFLOW_feb()); |
- putResult("cdphe_biologicalDFLOW_mar", model.getCDPHE_BiologicalDFLOW_mar()); |
- putResult("cdphe_biologicalDFLOW_apr", model.getCDPHE_BiologicalDFLOW_apr()); |
- putResult("cdphe_biologicalDFLOW_may", model.getCDPHE_BiologicalDFLOW_may()); |
- putResult("cdphe_biologicalDFLOW_jun", model.getCDPHE_BiologicalDFLOW_jun()); |
- putResult("cdphe_biologicalDFLOW_jul", model.getCDPHE_BiologicalDFLOW_jul()); |
- putResult("cdphe_biologicalDFLOW_aug", model.getCDPHE_BiologicalDFLOW_aug()); |
- putResult("cdphe_biologicalDFLOW_sep", model.getCDPHE_BiologicalDFLOW_sep()); |
- putResult("cdphe_biologicalDFLOW_oct", model.getCDPHE_BiologicalDFLOW_oct()); |
- putResult("cdphe_biologicalDFLOW_nov", model.getCDPHE_BiologicalDFLOW_nov()); |
- putResult("cdphe_biologicalDFLOW_dec", model.getCDPHE_BiologicalDFLOW_dec()); |
- putResult("cdphe_humanHealthDFLOW", model.getCDPHE_HumanHealthDFLOW()); |
+ putResult("cdphe_extremeValueDFLOW", model.getCDPHE_ExtremeValueDFLOW(), null, "cfs"); |
+ putResult("cdphe_biologicalDFLOW_all", model.getCDPHE_BiologicalDFLOW_all(), null, "cfs"); |
+ putResult("cdphe_biologicalDFLOW_jan", model.getCDPHE_BiologicalDFLOW_jan(), null, "cfs"); |
+ putResult("cdphe_biologicalDFLOW_feb", model.getCDPHE_BiologicalDFLOW_feb(), null, "cfs"); |
+ putResult("cdphe_biologicalDFLOW_mar", model.getCDPHE_BiologicalDFLOW_mar(), null, "cfs"); |
+ putResult("cdphe_biologicalDFLOW_apr", model.getCDPHE_BiologicalDFLOW_apr(), null, "cfs"); |
+ putResult("cdphe_biologicalDFLOW_may", model.getCDPHE_BiologicalDFLOW_may(), null, "cfs"); |
+ putResult("cdphe_biologicalDFLOW_jun", model.getCDPHE_BiologicalDFLOW_jun(), null, "cfs"); |
+ putResult("cdphe_biologicalDFLOW_jul", model.getCDPHE_BiologicalDFLOW_jul(), null, "cfs"); |
+ putResult("cdphe_biologicalDFLOW_aug", model.getCDPHE_BiologicalDFLOW_aug(), null, "cfs"); |
+ putResult("cdphe_biologicalDFLOW_sep", model.getCDPHE_BiologicalDFLOW_sep(), null, "cfs"); |
+ putResult("cdphe_biologicalDFLOW_oct", model.getCDPHE_BiologicalDFLOW_oct(), null, "cfs"); |
+ putResult("cdphe_biologicalDFLOW_nov", model.getCDPHE_BiologicalDFLOW_nov(), null, "cfs"); |
+ putResult("cdphe_biologicalDFLOW_dec", model.getCDPHE_BiologicalDFLOW_dec(), null, "cfs"); |
+ putResult("cdphe_humanHealthDFLOW", model.getCDPHE_HumanHealthDFLOW(), null, "cfs"); |
putResult("cdphe_reg31DFLOWsummary", model.getCDPHE_Reg31DFLOWsummary()); |
//Get all data results |
- putResult("max", model.getMax()); |
- putResult("min", model.getMin()); |
- putResult("upperQuartile", model.getUpperQuartile()); |
- putResult("lowerQuartile", model.getLowerQuartile()); |
- putResult("median", model.getMedian()); |
- putResult("mean", model.getMean()); |
- putResult("standardDeviation", model.getStandardDeviation()); |
+ putResult("max", model.getMax(), null, "cfs"); |
+ putResult("min", model.getMin(), null, "cfs"); |
+ putResult("upperQuartile", model.getUpperQuartile(), null, "cfs"); |
+ putResult("lowerQuartile", model.getLowerQuartile(), null, "cfs"); |
+ putResult("median", model.getMedian(), null, "cfs"); |
+ putResult("mean", model.getMean(), null, "cfs"); |
+ putResult("standardDeviation", model.getStandardDeviation(), null, "cfs"); |
putResult("variance", model.getVariance()); |
putResult("skewness", model.getSkewness()); |
putResult("coefficientOfVariation", model.getCoefficientOfVariation()); |
putResult("kendalCorrelationCoefficient", model.getKendallCorrelationCoefficient()); |
//Get Period 1 results |
putResult("len_period1", model.getLen_period1()); |
- putResult("max_period1", model.getMax_period1()); |
- putResult("min_period1", model.getMin_period1()); |
- putResult("upperQuartile_period1", model.getUpperQuartile_period1()); |
- putResult("lowerQuartile_period1", model.getLowerQuartile_period1()); |
- putResult("median_period1", model.getMedian_period1()); |
- putResult("mean_period1", model.getMean_period1()); |
- putResult("standardDeviation_period1", model.getStandardDeviation_period1()); |
+ putResult("max_period1", model.getMax_period1(), null, "cfs"); |
+ putResult("min_period1", model.getMin_period1(), null, "cfs"); |
+ putResult("upperQuartile_period1", model.getUpperQuartile_period1(), null, "cfs"); |
+ putResult("lowerQuartile_period1", model.getLowerQuartile_period1(), null, "cfs"); |
+ putResult("median_period1", model.getMedian_period1(), null, "cfs"); |
+ putResult("mean_period1", model.getMean_period1(), null, "cfs"); |
+ putResult("standardDeviation_period1", model.getStandardDeviation_period1(), null, "cfs"); |
putResult("variance_period1", model.getVariance_period1()); |
putResult("skewness_period1", model.getSkewness_period1()); |
putResult("coefficientOfVariation_period1", model.getCoefficientOfVariation_period1()); |
putResult("kendalCorrelationCoefficient_period1", model.getKendallCorrelationCoefficient_period1()); |
//Get Period 2 results |
putResult("len_period2", model.getLen_period2()); |
- putResult("max_period2", model.getMax_period2()); |
- putResult("min_period2", model.getMin_period2()); |
- putResult("upperQuartile_period2", model.getUpperQuartile_period2()); |
- putResult("lowerQuartile_period2", model.getLowerQuartile_period2()); |
- putResult("median_period2", model.getMedian_period2()); |
- putResult("mean_period2", model.getMean_period2()); |
- putResult("standardDeviation_period2", model.getStandardDeviation_period2()); |
+ putResult("max_period2", model.getMax_period2(), null, "cfs"); |
+ putResult("min_period2", model.getMin_period2(), null, "cfs"); |
+ putResult("upperQuartile_period2", model.getUpperQuartile_period2(), null, "cfs"); |
+ putResult("lowerQuartile_period2", model.getLowerQuartile_period2(), null, "cfs"); |
+ putResult("median_period2", model.getMedian_period2(), null, "cfs"); |
+ putResult("mean_period2", model.getMean_period2(), null, "cfs"); |
+ putResult("standardDeviation_period2", model.getStandardDeviation_period2(), null, "cfs"); |
putResult("variance_period2", model.getVariance_period2()); |
putResult("skewness_period2", model.getSkewness_period2()); |
putResult("coefficientOfVariation_period2", model.getCoefficientOfVariation_period2()); |
putResult("kendalCorrelationCoefficient_period2", model.getKendallCorrelationCoefficient_period2()); |
//Get Period 3 results |
putResult("len_period3", model.getLen_period3()); |
- putResult("max_period3", model.getMax_period3()); |
- putResult("min_period3", model.getMin_period3()); |
- putResult("upperQuartile_period3", model.getUpperQuartile_period3()); |
- putResult("lowerQuartile_period3", model.getLowerQuartile_period3()); |
- putResult("median_period3", model.getMedian_period3()); |
- putResult("mean_period3", model.getMean_period3()); |
- putResult("standardDeviation_period3", model.getStandardDeviation_period3()); |
+ putResult("max_period3", model.getMax_period3(), null, "cfs"); |
+ putResult("min_period3", model.getMin_period3(), null, "cfs"); |
+ putResult("upperQuartile_period3", model.getUpperQuartile_period3(), null, "cfs"); |
+ putResult("lowerQuartile_period3", model.getLowerQuartile_period3(), null, "cfs"); |
+ putResult("median_period3", model.getMedian_period3(), null, "cfs"); |
+ putResult("mean_period3", model.getMean_period3(), null, "cfs"); |
+ putResult("standardDeviation_period3", model.getStandardDeviation_period3(), null, "cfs"); |
putResult("variance_period3", model.getVariance_period3()); |
putResult("skewness_period3", model.getSkewness_period3()); |
putResult("coefficientOfVariation_period3", model.getCoefficientOfVariation_period3()); |