Mercurial > dive4elements > river
comparison 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 |
comparison
equal
deleted
inserted
replaced
9149:5be112fba832 | 9150:23945061daec |
---|---|
12 import java.util.ArrayList; | 12 import java.util.ArrayList; |
13 import java.util.Collection; | 13 import java.util.Collection; |
14 import java.util.List; | 14 import java.util.List; |
15 | 15 |
16 import org.apache.commons.lang.math.DoubleRange; | 16 import org.apache.commons.lang.math.DoubleRange; |
17 import org.dive4elements.artifacts.CallContext; | |
17 import org.dive4elements.river.artifacts.common.GeneralResultType; | 18 import org.dive4elements.river.artifacts.common.GeneralResultType; |
18 import org.dive4elements.river.artifacts.common.ResultRow; | 19 import org.dive4elements.river.artifacts.common.ResultRow; |
20 import org.dive4elements.river.artifacts.model.Calculation; | |
19 import org.dive4elements.river.artifacts.sinfo.common.RiverInfoProvider; | 21 import org.dive4elements.river.artifacts.sinfo.common.RiverInfoProvider; |
20 import org.dive4elements.river.artifacts.sinfo.common.SInfoResultType; | 22 import org.dive4elements.river.artifacts.sinfo.common.SInfoResultType; |
23 import org.dive4elements.river.artifacts.sinfo.util.RiverInfo; | |
21 import org.dive4elements.river.artifacts.sinfo.util.WstInfo; | 24 import org.dive4elements.river.artifacts.sinfo.util.WstInfo; |
22 | 25 |
23 /** | 26 /** |
24 * @author Gernot Belger | 27 * @author Gernot Belger |
25 */ | 28 */ |
27 | 30 |
28 private final Collection<ResultRow> rows = new ArrayList<>(); | 31 private final Collection<ResultRow> rows = new ArrayList<>(); |
29 | 32 |
30 private final RiverInfoProvider riverInfoProvider; | 33 private final RiverInfoProvider riverInfoProvider; |
31 | 34 |
32 public FloodDurationCalculator(final RiverInfoProvider riverInfoProvider) { | 35 private final CallContext context; |
33 | 36 |
37 public FloodDurationCalculator(final CallContext context, final RiverInfoProvider riverInfoProvider) { | |
38 this.context = context; | |
34 this.riverInfoProvider = riverInfoProvider; | 39 this.riverInfoProvider = riverInfoProvider; |
35 | |
36 } | 40 } |
37 | 41 |
38 public FloodDurationCalculationResult execute(final String label, final WstInfo wstInfo, final DoubleRange calcRange) { | 42 public FloodDurationCalculationResults execute(final Calculation problems, final String label, final WstInfo wstInfo, final String calcModeLabel, |
43 final DoubleRange calcRange, final String riverside, final String user) { | |
39 | 44 |
40 calculateResultRow(8888.888); | 45 calculateResultRow(8888.888); |
41 calculateResultRow(99); | 46 calculateResultRow(99); |
42 calculateResultRow(77); | 47 calculateResultRow(77); |
43 return new FloodDurationCalculationResult(label, wstInfo, this.rows, 4); | 48 |
49 final FloodDurationCalculationResult result = new FloodDurationCalculationResult(label, wstInfo, this.rows, 4); | |
50 | |
51 final RiverInfo riverInfo = new RiverInfo(this.riverInfoProvider.getRiver()); | |
52 | |
53 final FloodDurationCalculationResults results = new FloodDurationCalculationResults(calcModeLabel, user, riverInfo, calcRange, riverside); | |
54 results.addResult(result, problems); | |
55 return results; | |
44 } | 56 } |
45 | 57 |
46 private void calculateResultRow(final double station) { | 58 private void calculateResultRow(final double station) { |
47 | 59 |
48 final ResultRow row = ResultRow.create(); | 60 final ResultRow row = ResultRow.create(); |