diff artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java @ 8704:93a31cfb18c0

(issue1787) Sort WQ data locally over Q bevor lookup of Qs for given W.
author Tom Gottfried <tom@intevation.de>
date Thu, 23 Apr 2015 19:13:33 +0200
parents ea17665c5aad
children f51b9305d338
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java	Thu Apr 23 19:06:41 2015 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java	Thu Apr 23 19:13:33 2015 +0200
@@ -229,7 +229,7 @@
             log.debug("Determine Q values based on a set of W values.");
             qSel = false;
             ws   = getWs();
-            double [][] qws = getQsForWs(ws);
+            double [][] qws = getQsForWs(ws, report);
             if (qws == null || qws.length == 0) {
                 return error(new WQKms[0], "converting.ws.to.qs.failed");
             }
@@ -661,7 +661,7 @@
      *
      * @return an array of Q values.
      */
-    public double [][] getQsForWs(double[] ws) {
+    public double [][] getQsForWs(double[] ws, Calculation report) {
 
         if (ws == null) {
             log.error("getQsForWs: ws == null");
@@ -708,8 +708,8 @@
                 if (debug) {
                     log.debug("getQsForWs: lookup Q for W: " + w);
                 }
-                // There could bemore than one Q per W.
-                double [] qs = wst.findQsForW(km, w);
+                // There could be more than one Q per W.
+                double [] qs = wst.findQsForW(km, w, report);
                 for (int j = 0; j < qs.length; ++j) {
                     outWs.add(ws[i]);
                     outQs.add(qs[j]);

http://dive4elements.wald.intevation.org