Mercurial > dive4elements > river
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 3743:51f76225823b | 3744:b220287a171e |
|---|---|
| 140 List<Element> elements = new ArrayList<Element>(); | 140 List<Element> elements = new ArrayList<Element>(); |
| 141 | 141 |
| 142 double rangeFrom = dist[0]; | 142 double rangeFrom = dist[0]; |
| 143 double rangeTo = dist[1]; | 143 double rangeTo = dist[1]; |
| 144 | 144 |
| 145 int idx = 0; | |
| 146 | |
| 147 if (rangeFrom < rangeTo) { | 145 if (rangeFrom < rangeTo) { |
| 148 Collections.sort(gauges, GAUGE_UP); | 146 Collections.sort(gauges, GAUGE_UP); |
| 149 for (Gauge gauge: gauges) { | 147 for (Gauge gauge: gauges) { |
| 150 Range range = gauge.getRange(); | 148 Range range = gauge.getRange(); |
| 151 double lower = range.getA().doubleValue(); | 149 double lower = range.getA().doubleValue(); |
| 327 Range range = gauge.getRange(); | 325 Range range = gauge.getRange(); |
| 328 double lower = range.getA().doubleValue(); | 326 double lower = range.getA().doubleValue(); |
| 329 double upper = range.getB().doubleValue(); | 327 double upper = range.getB().doubleValue(); |
| 330 | 328 |
| 331 for (RangeWithValues rwv: rwvs) { | 329 for (RangeWithValues rwv: rwvs) { |
| 332 if (lower <= rwv.getLower() && upper >= rwv.getUpper()) { | 330 if (lower <= rwv.getStart() && upper >= rwv.getEnd()) { |
| 333 compareWsWithGauge(gauge, rwv.getValues()); | 331 compareWsWithGauge(gauge, rwv.getValues()); |
| 334 } | 332 } |
| 335 } | 333 } |
| 336 } | 334 } |
| 337 | 335 |
| 359 Range range = gauge.getRange(); | 357 Range range = gauge.getRange(); |
| 360 double lower = range.getA().doubleValue(); | 358 double lower = range.getA().doubleValue(); |
| 361 double upper = range.getB().doubleValue(); | 359 double upper = range.getB().doubleValue(); |
| 362 | 360 |
| 363 for (RangeWithValues rwv: rwvs) { | 361 for (RangeWithValues rwv: rwvs) { |
| 364 if (lower <= rwv.getLower() && upper >= rwv.getUpper()) { | 362 if (lower <= rwv.getStart() && upper >= rwv.getEnd()) { |
| 365 compareQsWithGauge(wst, gauge, rwv.getValues()); | 363 compareQsWithGauge(wst, gauge, rwv.getValues()); |
| 366 } | 364 } |
| 367 } | 365 } |
| 368 } | 366 } |
| 369 | 367 |