Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculator.java @ 9357:5ce50640688c
S-Info flood duration: fixed error report output name, changed duration from int to double, added formatter
| author | mschaefer |
|---|---|
| date | Wed, 01 Aug 2018 13:18:45 +0200 |
| parents | 7b2b086e45f0 |
| children | f318359b81a2 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculator.java Tue Jul 31 18:17:10 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculator.java Wed Aug 01 13:18:45 2018 +0200 @@ -177,7 +177,7 @@ final String label = wqd.getBezeichnung().startsWith("W=") ? "Q(" + wqd.getBezeichnung() + ")" : wqd.getBezeichnung(); final StickyAxisAnnotation annotation = new StickyAxisAnnotation(label, (float) wqd.getDischarge(), SimpleAxis.Y_AXIS, FloodDurationCurveGenerator.YAXIS.Q.idx); - annotation.setHitPoint(wqd.getFloodDurDaysPerYear()); + annotation.setHitPoint((float) wqd.getFloodDurDaysPerYear()); annotations.add(annotation); } return annotations; @@ -207,7 +207,7 @@ final String label = !wqd.getBezeichnung().startsWith("W=") ? "W(" + wqd.getBezeichnung() + ")" : wqd.getBezeichnung(); final StickyAxisAnnotation annotation = new StickyAxisAnnotation(label, (float) wqd.getWaterlevel(), SimpleAxis.Y_AXIS, FloodDurationCurveGenerator.YAXIS.W.idx); - annotation.setHitPoint(wqd.getFloodDurDaysPerYear()); + annotation.setHitPoint((float) wqd.getFloodDurDaysPerYear()); annotations.add(annotation); } return annotations; @@ -424,11 +424,7 @@ final List<DurationWaterlevel> wsts = new ArrayList<>(wqkmsArray.length); for (int i = 0; i <= wqkmsArray.length - 1; i++) { - assert (wqkmsArray[i].getKm(kmIndex) == station.doubleValue()); - - final int overflowDays = (int) Math.round(gaugeDurations.get(i)); - - final DurationWaterlevel dw = new DurationWaterlevel(wqkmsArray[i].getW(kmIndex), overflowDays, wqkmsArray[i].getQ(kmIndex), + final DurationWaterlevel dw = new DurationWaterlevel(wqkmsArray[i].getW(kmIndex), gaugeDurations.get(i), wqkmsArray[i].getQ(kmIndex), wqkmsArray[i].getName()); wsts.add(dw); }