diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java @ 642:2dbbb5be30a1

Re-eanbled the calculation of the backjump correction. flys-artifacts/trunk@2026 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Fri, 27 May 2011 16:52:37 +0000
parents 58276db49b16
children 627be3ca1ab6
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java	Fri May 27 10:09:46 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java	Fri May 27 16:52:37 2011 +0000
@@ -44,7 +44,7 @@
         private int order;
 
         public GaugeOrder(boolean up) {
-            order = up ? 1 : 1;
+            order = up ? 1 : -1;
         }
 
         public int compare(Gauge a, Gauge b) {
@@ -149,13 +149,15 @@
         }
         else {
             Collections.sort(gauges, GAUGE_DOWN);
+            rangeFrom = dist[1];
+            rangeTo   = dist[0];
             for (Gauge gauge: gauges) {
                 Range range = gauge.getRange();
                 double lower = range.getA().doubleValue();
                 double upper = range.getB().doubleValue();
 
-                double to   = upper < rangeTo   ? rangeTo   : upper;
-                double from = lower > rangeFrom ? rangeFrom : lower;
+                double from = lower < rangeFrom ? rangeFrom : lower;
+                double to   = upper > rangeTo   ? rangeTo   : upper;
 
                 elements[idx++] = createItem(
                     cr, new String[] { to + ";" + from, ""});

http://dive4elements.wald.intevation.org