Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepthdev/FlowDepthDevelopmentCalculation.java @ 9312:740d65e4aa14
Q [m³/s] one message
author | gernotbelger |
---|---|
date | Thu, 26 Jul 2018 15:54:20 +0200 |
parents | 5294114b1df4 |
children | 392745cccede |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepthdev/FlowDepthDevelopmentCalculation.java Thu Jul 26 11:16:06 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepthdev/FlowDepthDevelopmentCalculation.java Thu Jul 26 15:54:20 2018 +0200 @@ -117,8 +117,7 @@ FlowDepthUtils.checkYearDifference(Resources.getMsg(this.context.getMeta(), "flowdepthdevelopmentcalculation.yearDifferenceCurrent"), currentWstYear, currentSoundingYear, problems); FlowDepthUtils.checkYearDifference(Resources.getMsg(this.context.getMeta(), "flowdepthdevelopmentcalculation.yearDifferenceHistorical"), - historicalWstYear, - historicalSoundingYear, problems); + historicalWstYear, historicalSoundingYear, problems); /* re-determine the reference gauge, in the same way as the WaterlevelArtifact would do it */ final RiverInfoProvider currentRiverInfoProvider = infoProvider.forWaterlevel(currentWaterlevel); @@ -139,7 +138,7 @@ final double diffYear = currentMeanYear - historcialMeanYear; /* real calculation loop */ - final Collection< ResultRow> rows = new ArrayList<>(); + final Collection<ResultRow> rows = new ArrayList<>(); final Collection<Double> stations = determineCalculationSteps(currentSounding, historicalSounding); for (final double station : stations) { @@ -168,7 +167,7 @@ // REMARK: access the location once only during calculation final String location = currentRiverInfoProvider.getLocation(station); - final ResultRow row = ResultRow.create().// + final ResultRow row = ResultRow.create().// putValue(GeneralResultType.station, station). // putValue(SInfoResultType.flowdepthDevelopment, flowDepthDevelopment). // putValue(SInfoResultType.flowdepthDevelopmentPerYear, flowDepthDevelopmentPerYear). // @@ -176,15 +175,14 @@ putValue(SInfoResultType.bedHeightDifference, diffBedHeight). // putValue(SInfoResultType.flowdepthCurrent, currentFlowDepth). // putValue(SInfoResultType.flowdepthHistorical, historicalFlowDepth). // - putValue(SInfoResultType.location, location); + putValue(GeneralResultType.location, location); rows.add(row); } } final String label = buildLabel(currentWaterlevel, currentSoundingInfo, historicalWaterlevel, historicalSoundingInfo); - return new FlowDepthDevelopmentCalculationResult(label, currentWstInfo, historicalWstInfo, currentSoundingInfo, historicalSoundingInfo, - rows); + return new FlowDepthDevelopmentCalculationResult(label, currentWstInfo, historicalWstInfo, currentSoundingInfo, historicalSoundingInfo, rows); } /**