diff 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
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java	Fri Jul 27 08:36:24 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java	Fri Jul 27 12:36:09 2012 +0000
@@ -54,7 +54,14 @@
                 || type.equals(SQ_C_CURVE)
                 || type.equals(SQ_D_CURVE)
                 || type.equals(SQ_E_CURVE)
-                || type.equals(SQ_F_CURVE))
+                || type.equals(SQ_F_CURVE)
+                || type.equals(SQ_A_OUTLIER_CURVE)
+                || type.equals(SQ_B_OUTLIER_CURVE)
+                || type.equals(SQ_C_OUTLIER_CURVE)
+                || type.equals(SQ_D_OUTLIER_CURVE)
+                || type.equals(SQ_E_OUTLIER_CURVE)
+                || type.equals(SQ_F_OUTLIER_CURVE)
+                )
             {
                 return true;
             }
@@ -67,7 +74,14 @@
                 || type.equals(SQ_C_MEASUREMENT)
                 || type.equals(SQ_D_MEASUREMENT)
                 || type.equals(SQ_E_MEASUREMENT)
-                || type.equals(SQ_F_MEASUREMENT))
+                || type.equals(SQ_F_MEASUREMENT)
+                || type.equals(SQ_A_OUTLIER_MEASUREMENT)
+                || type.equals(SQ_B_OUTLIER_MEASUREMENT)
+                || type.equals(SQ_C_OUTLIER_MEASUREMENT)
+                || type.equals(SQ_D_OUTLIER_MEASUREMENT)
+                || type.equals(SQ_E_OUTLIER_MEASUREMENT)
+                || type.equals(SQ_F_OUTLIER_MEASUREMENT)
+                )
             {
                 return true;
             }
@@ -204,26 +218,38 @@
     String SQ_A_CURVE       = "sq_a_curve";
     String SQ_A_MEASUREMENT = "sq_a_measurement";
     String SQ_A_OUTLIER     = "sq_a_outlier";
+    String SQ_A_OUTLIER_CURVE = "sq_a_outlier_curve";
+    String SQ_A_OUTLIER_MEASUREMENT = "sq_a_outlier_measurement";
 
     String SQ_B_CURVE       = "sq_b_curve";
     String SQ_B_MEASUREMENT = "sq_b_measurement";
     String SQ_B_OUTLIER     = "sq_b_outlier";
+    String SQ_B_OUTLIER_CURVE  = "sq_b_outlier_curve";
+    String SQ_B_OUTLIER_MEASUREMENT  = "sq_b_outlier_measurement";
 
     String SQ_C_CURVE       = "sq_c_curve";
     String SQ_C_MEASUREMENT = "sq_c_measurement";
     String SQ_C_OUTLIER     = "sq_c_outlier";
+    String SQ_C_OUTLIER_CURVE = "sq_c_outlier_curve";
+    String SQ_C_OUTLIER_MEASUREMENT = "sq_c_outlier_measurement";
 
     String SQ_D_CURVE       = "sq_d_curve";
     String SQ_D_MEASUREMENT = "sq_d_measurement";
     String SQ_D_OUTLIER     = "sq_d_outlier";
+    String SQ_D_OUTLIER_CURVE = "sq_d_outlier_curve";
+    String SQ_D_OUTLIER_MEASUREMENT = "sq_d_outlier_measurement";
 
     String SQ_E_CURVE       = "sq_e_curve";
     String SQ_E_MEASUREMENT = "sq_e_measurement";
     String SQ_E_OUTLIER     = "sq_e_outlier";
+    String SQ_E_OUTLIER_CURVE = "sq_e_outlier_curve";
+    String SQ_E_OUTLIER_MEASUREMENT = "sq_e_outlier_curve_measurement";
 
     String SQ_F_CURVE       = "sq_f_curve";
     String SQ_F_MEASUREMENT = "sq_f_measurement";
     String SQ_F_OUTLIER     = "sq_f_outlier";
+    String SQ_F_OUTLIER_CURVE = "sq_f_outlier_curve";
+    String SQ_F_OUTLIER_MEASUREMENT = "sq_f_outlier_measurement";
 
     String RELATIVE_POINT = "relativepoint";
 

http://dive4elements.wald.intevation.org