diff flys-artifacts/src/main/java/de/intevation/flys/exports/sq/SQRelationExporter.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 56f62b5209f5
children
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/sq/SQRelationExporter.java	Fri Jul 27 08:36:24 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/sq/SQRelationExporter.java	Fri Jul 27 12:36:09 2012 +0000
@@ -120,20 +120,26 @@
     protected void data2CSV(CSVWriter writer, SQResult result) {
         logger.debug("data2CSV");
 
+        // TODO: i18n
         String km = String.valueOf(result.getKm());
 
         for (int i = 0; i < SQResult.NUMBER_FRACTIONS; ++i) {
             SQFractionResult fraction = result.getFraction(i);
-            if (!fraction.isValid()) {
+
+            String name = result.getFractionName(i);
+
+            Parameters parameters = fraction.getParameters();
+
+            if (parameters == null) {
                 continue;
             }
-            String name = result.getFractionName(i);
-            Parameters parameters = fraction.getParameters();
+
             double a  = parameters.getValue(0, "a");
             double b  = parameters.getValue(0, "b");
             double sd = Math.sqrt(parameters.getValue(0, "std_dev"));
-            int    t  = fraction.getTotalCount();
-            int    o  = fraction.getOutliersCount();
+            int    o  = fraction.totalNumOutliers();
+            int    t  = fraction.numMeasurements() + o;
+
             writer.writeNext(new String[] {
                 km,
                 name,

http://dive4elements.wald.intevation.org