# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1328538062 0
# Node ID 3973a2451cf78a75151b4a147ed9517c6139840f
# Parent  e92545d2069e5b9da628146d810d42286ce7def6
"Bezugslinienverfahren": Store Qs of calculation, too.


flys-artifacts/trunk@3928 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r e92545d2069e -r 3973a2451cf7 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Mon Feb 06 14:02:04 2012 +0000
+++ b/flys-artifacts/ChangeLog	Mon Feb 06 14:21:02 2012 +0000
@@ -1,3 +1,12 @@
+2012-02-06	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/model/WW.java: Added constructor call.
+	* src/main/java/de/intevation/flys/artifacts/model/WWQQ.java: New.
+	  Stores the Qs for the Ws, too.
+
+	* src/main/java/de/intevation/flys/artifacts/model/Calculation5.java: Create
+	  WWQQs instead of WWs.
+
 2012-02-06  Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	* src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java:
diff -r e92545d2069e -r 3973a2451cf7 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation5.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation5.java	Mon Feb 06 14:02:04 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation5.java	Mon Feb 06 14:21:02 2012 +0000
@@ -36,17 +36,16 @@
             int newNumProblems = numProblems();
 
             if (wws.length == 4) {
-                // TODO: Create WQWQ instead.
-                WW ww = new WW(
+                WWQQ wwqq = new WWQQ(
                     generateName(startKm, endKm),
-                    startKm, kms2gaugeDatums.get(startKm), wws[0],
-                    endKm,   kms2gaugeDatums.get(endKm),   wws[2]);
+                    startKm, kms2gaugeDatums.get(startKm), wws[0], wws[1],
+                    endKm,   kms2gaugeDatums.get(endKm),   wws[2], wws[3]);
 
                 if (newNumProblems > numProblems) {
-                    ww.removeNaNs();
+                    wwqq.removeNaNs();
                 }
 
-                results.add(ww);
+                results.add(wwqq);
             }
             numProblems = newNumProblems;
         }
diff -r e92545d2069e -r 3973a2451cf7 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WW.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WW.java	Mon Feb 06 14:02:04 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WW.java	Mon Feb 06 14:21:02 2012 +0000
@@ -64,6 +64,7 @@
     protected Double endDatum;
 
     public WW() {
+        this("");
     }
 
     public WW(String name) {
diff -r e92545d2069e -r 3973a2451cf7 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WWQQ.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WWQQ.java	Mon Feb 06 14:21:02 2012 +0000
@@ -0,0 +1,97 @@
+package de.intevation.flys.artifacts.model;
+
+import de.intevation.flys.artifacts.math.Identity;
+
+import gnu.trove.TDoubleArrayList;
+
+public class WWQQ
+extends      WW
+{
+    public static class ApplyFunctionIterator
+    extends             WW.ApplyFunctionIterator
+    {
+        public ApplyFunctionIterator(WWQQ ww) {
+            super(ww, Identity.IDENTITY, Identity.IDENTITY);
+        }
+
+        @Override
+        public void get(int idx, double [] wwqqPair) {
+            WWQQ wwqq = (WWQQ)ww;
+            wwqqPair[0] = function1.value(wwqq.getW(idx));
+            wwqqPair[1] = function2.value(wwqq.getW2(idx));
+            wwqqPair[2] = wwqq.getQ1(idx);
+            wwqqPair[3] = wwqq.getQ2(idx);
+        }
+    } // class ApplyFunctionIterator
+
+    protected TDoubleArrayList qs1;
+    protected TDoubleArrayList qs2;
+
+    public WWQQ() {
+        this("");
+    }
+
+    public WWQQ(String name) {
+        super(name);
+    }
+
+    public WWQQ(int capacity) {
+        this(capacity, "");
+    }
+
+    public WWQQ(int capacity, String name) {
+        super(capacity, name);
+    }
+
+    public WWQQ(
+        String    name, 
+        double    startKm,
+        Double    startDatum,
+        double [] ws1,
+        double [] qs1,
+        double    endKm,
+        Double    endDatum,
+        double [] ws2,
+        double [] qs2
+    ) {
+        super(name, startKm, startDatum, ws1, endKm, endDatum, ws2);
+        this.qs1 = new TDoubleArrayList(qs1);
+        this.qs2 = new TDoubleArrayList(qs2);
+    }
+
+    public double getQ1(int idx) {
+        return qs1.getQuick(idx);
+    }
+
+    public double getQ2(int idx) {
+        return qs2.getQuick(idx);
+    }
+
+    public double [] getQs1() {
+        return qs1.toNativeArray();
+    }
+
+    public double [] getQs2() {
+        return qs2.toNativeArray();
+    }
+
+    @Override
+    public double [] get(int idx) {
+        return get(idx, new double[4]);
+    }
+
+    @Override
+    public double [] get(int idx, double [] dst) {
+        dst[0] = ws .getQuick(idx);
+        dst[1] = ws2.getQuick(idx);
+        dst[2] = qs1.getQuick(idx);
+        dst[3] = qs2.getQuick(idx);
+        return dst;
+    }
+
+    @Override
+    public void removeNaNs() {
+        removeNaNs(new TDoubleArrayList [] { ws, ws2, qs1, qs2 });
+    }
+}
+// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :