@@ -26,7 +26,6 @@ |
|
String analysisType = ""; |
guiFlood_Model model = new guiFlood_Model(); |
- Bulletin17C c17 = new Bulletin17C(); |
|
@Override |
protected void preProcess() throws Exception { |
@@ -56,10 +55,6 @@ |
model.setHighSystematicThreshold( inputPayload.getDouble( "high_systematic_threshold" ) ); |
model.setLowOutlierThreshold( inputPayload.getDouble( "low_outlier_threshold" ) ); |
model.setLowOutlierMethod( inputPayload.getString( "low_outlier_method" ) ); |
- model.setAtSiteSkewOption( inputPayload.getString( "at_site_skew_option" ) ); |
- model.setHighSystematicThreshold( inputPayload.getDouble( "high_systematic_threshold" ) ); |
- model.setLowOutlierThreshold( inputPayload.getDouble( "low_outlier_threshold" ) ); |
- model.setLowOutlierMethod( inputPayload.getString( "low_outlier_method" ) ); |
model.setExecutable( e ); |
} |
|
@@ -79,7 +74,7 @@ |
|
PayloadResults resultPayload = results(); |
|
- if ( analysisType.equals( "b17" ) ) { |
+ if ( analysisType.equalsIgnoreCase( "b17" ) ) { |
// files |
File wd = workspace().getDir(); |
resultPayload.put( new File( wd, model.getGraph() ) ); |
@@ -103,10 +98,9 @@ |
resultPayload.put( "highOutliers_station_skew", model.getHighOutliersStationSkew() ); |
resultPayload.put( "lowOutliers_weighted_generalized_skew", model.getLowOutliersWeightedGenSkew() ); |
resultPayload.put( "highOutliers_weighted_generalized_skew", model.getHighOutliersWeightedGenSkew() ); |
- } else if ( analysisType.equals( "c17" ) ) { |
+ } else if ( analysisType.equalsIgnoreCase( "c17" ) ) { |
resultPayload.put( "17c_station_output", model.stationResult.toJSON() ); |
resultPayload.put( "17c_weighted_output", model.weightedResult.toJSON() ); |
- resultPayload.put( "finished", true ); |
} |
} |
} |