Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculator.java @ 9150:23945061daec
gigantic refactoring: exporter, result, results
to support multiple jaspers -> collisions
author | gernotbelger |
---|---|
date | Thu, 14 Jun 2018 16:56:31 +0200 |
parents | e6b63b2b41b9 |
children | 9b2e46090099 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculator.java Thu Jun 14 15:12:25 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculator.java Thu Jun 14 16:56:31 2018 +0200 @@ -14,10 +14,13 @@ import java.util.List; import org.apache.commons.lang.math.DoubleRange; +import org.dive4elements.artifacts.CallContext; import org.dive4elements.river.artifacts.common.GeneralResultType; import org.dive4elements.river.artifacts.common.ResultRow; +import org.dive4elements.river.artifacts.model.Calculation; import org.dive4elements.river.artifacts.sinfo.common.RiverInfoProvider; import org.dive4elements.river.artifacts.sinfo.common.SInfoResultType; +import org.dive4elements.river.artifacts.sinfo.util.RiverInfo; import org.dive4elements.river.artifacts.sinfo.util.WstInfo; /** @@ -29,18 +32,27 @@ private final RiverInfoProvider riverInfoProvider; - public FloodDurationCalculator(final RiverInfoProvider riverInfoProvider) { + private final CallContext context; + public FloodDurationCalculator(final CallContext context, final RiverInfoProvider riverInfoProvider) { + this.context = context; this.riverInfoProvider = riverInfoProvider; - } - public FloodDurationCalculationResult execute(final String label, final WstInfo wstInfo, final DoubleRange calcRange) { + public FloodDurationCalculationResults execute(final Calculation problems, final String label, final WstInfo wstInfo, final String calcModeLabel, + final DoubleRange calcRange, final String riverside, final String user) { calculateResultRow(8888.888); calculateResultRow(99); calculateResultRow(77); - return new FloodDurationCalculationResult(label, wstInfo, this.rows, 4); + + final FloodDurationCalculationResult result = new FloodDurationCalculationResult(label, wstInfo, this.rows, 4); + + final RiverInfo riverInfo = new RiverInfo(this.riverInfoProvider.getRiver()); + + final FloodDurationCalculationResults results = new FloodDurationCalculationResults(calcModeLabel, user, riverInfo, calcRange, riverside); + results.addResult(result, problems); + return results; } private void calculateResultRow(final double station) {