# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1307559040 0
# Node ID 8124ca1ecaaa7fcda46535e44406867d06c481b9
# Parent  23fced04ffdb67b825397e825ecd31c02e622bb7
Berechnung 4: Added more debug output

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

diff -r 23fced04ffdb -r 8124ca1ecaaa flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Wed Jun 08 13:57:43 2011 +0000
+++ b/flys-artifacts/ChangeLog	Wed Jun 08 18:50:40 2011 +0000
@@ -1,3 +1,9 @@
+2011-06-08  Sascha L. Teichmann <sascha.teichmann@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/model/Segment.java,
+	  src/main/java/de/intevation/flys/artifacts/model/Calculation4.java:
+	  Added more debug output.
+
 2011-06-08  Ingo Weinzierl <ingo@intevation.de>
 
 	  flys/issue103 PART 1 (WINFO: Wasserspiegellagenberechnung / Layout-Inkonsistenz)
diff -r 23fced04ffdb -r 8124ca1ecaaa flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation4.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation4.java	Wed Jun 08 13:57:43 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation4.java	Wed Jun 08 18:50:40 2011 +0000
@@ -93,6 +93,9 @@
             logger.debug(
                 "calculate from " + from + " to " + to + " step " + step);
             logger.debug("# segments: " + segments.size());
+            for (Segment segment: segments) {
+                logger.debug("  " + segment);
+            }
         }
 
         if (segments.isEmpty()) {
@@ -109,9 +112,6 @@
 
 
         WQKms [] results = new WQKms[numResults];
-                    if (debug) {
-                        logger.debug("after last segment -> gleichwertig");
-                    }
         for (int i = 0; i < results.length; ++i) {
             results[i] = new WQKms();
         }
@@ -225,6 +225,14 @@
                                 : new Linear(
                                     qA, qF,
                                     anchor.values[i], free.values[i]);
+
+                            if (debug) {
+                                logger.debug(
+                                    anchor.referencePoint + ": " + 
+                                    qA + " -> " + functions[i].value(qA) +
+                                    " / " + free.referencePoint + ": " +
+                                    qF + " -> " + functions[i].value(qF));
+                            }
                         }
                     } // build transforms
                 } // "ungleichwertiges" interval
diff -r 23fced04ffdb -r 8124ca1ecaaa flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Segment.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Segment.java	Wed Jun 08 13:57:43 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Segment.java	Wed Jun 08 18:50:40 2011 +0000
@@ -42,7 +42,9 @@
     public String toString() {
         StringBuilder sb = new StringBuilder("Segment: [");
         sb.append("from: ").append(from).append("; to: ")
-          .append(to).append("; values: (");
+          .append(to)
+          .append("; ref: ").append(referencePoint)
+          .append("; values: (");
         for (int i = 0; i < values.length; ++i) {
             if (i > 0) sb.append(", ");
             sb.append(values[i]);