Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java @ 3552:1df6984628c3
S/Q: Extented the result data model of the S/Q calculation to
store the curve coefficients for each iteration step
of the outlier elimination.
flys-artifacts/trunk@5146 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Fri, 27 Jul 2012 12:36:09 +0000 |
parents | 45af081061e7 |
children | 416288f88763 |
comparison
equal
deleted
inserted
replaced
3551:e7f1556192b3 | 3552:1df6984628c3 |
---|---|
52 if (type.equals(SQ_A_CURVE) | 52 if (type.equals(SQ_A_CURVE) |
53 || type.equals(SQ_B_CURVE) | 53 || type.equals(SQ_B_CURVE) |
54 || type.equals(SQ_C_CURVE) | 54 || type.equals(SQ_C_CURVE) |
55 || type.equals(SQ_D_CURVE) | 55 || type.equals(SQ_D_CURVE) |
56 || type.equals(SQ_E_CURVE) | 56 || type.equals(SQ_E_CURVE) |
57 || type.equals(SQ_F_CURVE)) | 57 || type.equals(SQ_F_CURVE) |
58 || type.equals(SQ_A_OUTLIER_CURVE) | |
59 || type.equals(SQ_B_OUTLIER_CURVE) | |
60 || type.equals(SQ_C_OUTLIER_CURVE) | |
61 || type.equals(SQ_D_OUTLIER_CURVE) | |
62 || type.equals(SQ_E_OUTLIER_CURVE) | |
63 || type.equals(SQ_F_OUTLIER_CURVE) | |
64 ) | |
58 { | 65 { |
59 return true; | 66 return true; |
60 } | 67 } |
61 | 68 |
62 return false; | 69 return false; |
65 if (type.equals(SQ_A_MEASUREMENT) | 72 if (type.equals(SQ_A_MEASUREMENT) |
66 || type.equals(SQ_B_MEASUREMENT) | 73 || type.equals(SQ_B_MEASUREMENT) |
67 || type.equals(SQ_C_MEASUREMENT) | 74 || type.equals(SQ_C_MEASUREMENT) |
68 || type.equals(SQ_D_MEASUREMENT) | 75 || type.equals(SQ_D_MEASUREMENT) |
69 || type.equals(SQ_E_MEASUREMENT) | 76 || type.equals(SQ_E_MEASUREMENT) |
70 || type.equals(SQ_F_MEASUREMENT)) | 77 || type.equals(SQ_F_MEASUREMENT) |
78 || type.equals(SQ_A_OUTLIER_MEASUREMENT) | |
79 || type.equals(SQ_B_OUTLIER_MEASUREMENT) | |
80 || type.equals(SQ_C_OUTLIER_MEASUREMENT) | |
81 || type.equals(SQ_D_OUTLIER_MEASUREMENT) | |
82 || type.equals(SQ_E_OUTLIER_MEASUREMENT) | |
83 || type.equals(SQ_F_OUTLIER_MEASUREMENT) | |
84 ) | |
71 { | 85 { |
72 return true; | 86 return true; |
73 } | 87 } |
74 | 88 |
75 return false; | 89 return false; |
202 String SQ_OVERVIEW = "sq_overview"; | 216 String SQ_OVERVIEW = "sq_overview"; |
203 | 217 |
204 String SQ_A_CURVE = "sq_a_curve"; | 218 String SQ_A_CURVE = "sq_a_curve"; |
205 String SQ_A_MEASUREMENT = "sq_a_measurement"; | 219 String SQ_A_MEASUREMENT = "sq_a_measurement"; |
206 String SQ_A_OUTLIER = "sq_a_outlier"; | 220 String SQ_A_OUTLIER = "sq_a_outlier"; |
221 String SQ_A_OUTLIER_CURVE = "sq_a_outlier_curve"; | |
222 String SQ_A_OUTLIER_MEASUREMENT = "sq_a_outlier_measurement"; | |
207 | 223 |
208 String SQ_B_CURVE = "sq_b_curve"; | 224 String SQ_B_CURVE = "sq_b_curve"; |
209 String SQ_B_MEASUREMENT = "sq_b_measurement"; | 225 String SQ_B_MEASUREMENT = "sq_b_measurement"; |
210 String SQ_B_OUTLIER = "sq_b_outlier"; | 226 String SQ_B_OUTLIER = "sq_b_outlier"; |
227 String SQ_B_OUTLIER_CURVE = "sq_b_outlier_curve"; | |
228 String SQ_B_OUTLIER_MEASUREMENT = "sq_b_outlier_measurement"; | |
211 | 229 |
212 String SQ_C_CURVE = "sq_c_curve"; | 230 String SQ_C_CURVE = "sq_c_curve"; |
213 String SQ_C_MEASUREMENT = "sq_c_measurement"; | 231 String SQ_C_MEASUREMENT = "sq_c_measurement"; |
214 String SQ_C_OUTLIER = "sq_c_outlier"; | 232 String SQ_C_OUTLIER = "sq_c_outlier"; |
233 String SQ_C_OUTLIER_CURVE = "sq_c_outlier_curve"; | |
234 String SQ_C_OUTLIER_MEASUREMENT = "sq_c_outlier_measurement"; | |
215 | 235 |
216 String SQ_D_CURVE = "sq_d_curve"; | 236 String SQ_D_CURVE = "sq_d_curve"; |
217 String SQ_D_MEASUREMENT = "sq_d_measurement"; | 237 String SQ_D_MEASUREMENT = "sq_d_measurement"; |
218 String SQ_D_OUTLIER = "sq_d_outlier"; | 238 String SQ_D_OUTLIER = "sq_d_outlier"; |
239 String SQ_D_OUTLIER_CURVE = "sq_d_outlier_curve"; | |
240 String SQ_D_OUTLIER_MEASUREMENT = "sq_d_outlier_measurement"; | |
219 | 241 |
220 String SQ_E_CURVE = "sq_e_curve"; | 242 String SQ_E_CURVE = "sq_e_curve"; |
221 String SQ_E_MEASUREMENT = "sq_e_measurement"; | 243 String SQ_E_MEASUREMENT = "sq_e_measurement"; |
222 String SQ_E_OUTLIER = "sq_e_outlier"; | 244 String SQ_E_OUTLIER = "sq_e_outlier"; |
245 String SQ_E_OUTLIER_CURVE = "sq_e_outlier_curve"; | |
246 String SQ_E_OUTLIER_MEASUREMENT = "sq_e_outlier_curve_measurement"; | |
223 | 247 |
224 String SQ_F_CURVE = "sq_f_curve"; | 248 String SQ_F_CURVE = "sq_f_curve"; |
225 String SQ_F_MEASUREMENT = "sq_f_measurement"; | 249 String SQ_F_MEASUREMENT = "sq_f_measurement"; |
226 String SQ_F_OUTLIER = "sq_f_outlier"; | 250 String SQ_F_OUTLIER = "sq_f_outlier"; |
251 String SQ_F_OUTLIER_CURVE = "sq_f_outlier_curve"; | |
252 String SQ_F_OUTLIER_MEASUREMENT = "sq_f_outlier_measurement"; | |
227 | 253 |
228 String RELATIVE_POINT = "relativepoint"; | 254 String RELATIVE_POINT = "relativepoint"; |
229 | 255 |
230 String FIX_ANALYSIS_EVENTS_DWT = "fix_analysis_events_dwt"; | 256 String FIX_ANALYSIS_EVENTS_DWT = "fix_analysis_events_dwt"; |
231 String FIX_ANALYSIS_EVENTS_LS = "fix_analysis_events_ls"; | 257 String FIX_ANALYSIS_EVENTS_LS = "fix_analysis_events_ls"; |