Mercurial > dive4elements > river
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 641:ab9b6cae0d0d | 642:2dbbb5be30a1 |
|---|---|
| 42 | 42 |
| 43 public static final class GaugeOrder implements Comparator<Gauge> { | 43 public static final class GaugeOrder implements Comparator<Gauge> { |
| 44 private int order; | 44 private int order; |
| 45 | 45 |
| 46 public GaugeOrder(boolean up) { | 46 public GaugeOrder(boolean up) { |
| 47 order = up ? 1 : 1; | 47 order = up ? 1 : -1; |
| 48 } | 48 } |
| 49 | 49 |
| 50 public int compare(Gauge a, Gauge b) { | 50 public int compare(Gauge a, Gauge b) { |
| 51 return order * a.getRange().getA().compareTo(b.getRange().getA()); | 51 return order * a.getRange().getA().compareTo(b.getRange().getA()); |
| 52 } | 52 } |
| 147 cr, new String[] { from + ";" + to, ""}); | 147 cr, new String[] { from + ";" + to, ""}); |
| 148 } | 148 } |
| 149 } | 149 } |
| 150 else { | 150 else { |
| 151 Collections.sort(gauges, GAUGE_DOWN); | 151 Collections.sort(gauges, GAUGE_DOWN); |
| 152 rangeFrom = dist[1]; | |
| 153 rangeTo = dist[0]; | |
| 152 for (Gauge gauge: gauges) { | 154 for (Gauge gauge: gauges) { |
| 153 Range range = gauge.getRange(); | 155 Range range = gauge.getRange(); |
| 154 double lower = range.getA().doubleValue(); | 156 double lower = range.getA().doubleValue(); |
| 155 double upper = range.getB().doubleValue(); | 157 double upper = range.getB().doubleValue(); |
| 156 | 158 |
| 157 double to = upper < rangeTo ? rangeTo : upper; | 159 double from = lower < rangeFrom ? rangeFrom : lower; |
| 158 double from = lower > rangeFrom ? rangeFrom : lower; | 160 double to = upper > rangeTo ? rangeTo : upper; |
| 159 | 161 |
| 160 elements[idx++] = createItem( | 162 elements[idx++] = createItem( |
| 161 cr, new String[] { to + ";" + from, ""}); | 163 cr, new String[] { to + ";" + from, ""}); |
| 162 } | 164 } |
| 163 } | 165 } |