Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java @ 3744:b220287a171e
Slightly refactored range with values code to be useful in extreme waterlevels.
flys-artifacts/trunk@5427 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Mon, 10 Sep 2012 16:52:15 +0000 |
| parents | 6342166ccdef |
| children | 96ea983b5c45 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java Mon Sep 10 15:59:34 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java Mon Sep 10 16:52:15 2012 +0000 @@ -142,8 +142,6 @@ double rangeFrom = dist[0]; double rangeTo = dist[1]; - int idx = 0; - if (rangeFrom < rangeTo) { Collections.sort(gauges, GAUGE_UP); for (Gauge gauge: gauges) { @@ -329,7 +327,7 @@ double upper = range.getB().doubleValue(); for (RangeWithValues rwv: rwvs) { - if (lower <= rwv.getLower() && upper >= rwv.getUpper()) { + if (lower <= rwv.getStart() && upper >= rwv.getEnd()) { compareWsWithGauge(gauge, rwv.getValues()); } } @@ -361,7 +359,7 @@ double upper = range.getB().doubleValue(); for (RangeWithValues rwv: rwvs) { - if (lower <= rwv.getLower() && upper >= rwv.getUpper()) { + if (lower <= rwv.getStart() && upper >= rwv.getEnd()) { compareQsWithGauge(wst, gauge, rwv.getValues()); } }