Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/inundationduration/InundationDurationCalculation.java @ 9069:1ffd38826175
access uinfo.vegetationzones+inundation_duration
author | gernotbelger |
---|---|
date | Tue, 15 May 2018 12:00:26 +0200 |
parents | fb9430250899 |
children | 611a523fc42f |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/inundationduration/InundationDurationCalculation.java Mon May 14 18:24:35 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/inundationduration/InundationDurationCalculation.java Tue May 15 12:00:26 2018 +0200 @@ -1,6 +1,6 @@ /** Copyright (C) 2017 by Bundesanstalt für Gewässerkunde - * Software engineering by - * Björnsen Beratende Ingenieure GmbH + * Software engineering by + * Björnsen Beratende Ingenieure GmbH * Dr. Schumacher Ingenieurbüro für Wasser und Umwelt * * This file is Free Software under the GNU AGPL (>=v3) @@ -31,13 +31,13 @@ */ final class InundationDurationCalculation { - private CallContext context; + private final CallContext context; - public InundationDurationCalculation(CallContext context) { + public InundationDurationCalculation(final CallContext context) { this.context = context; } - public CalculationResult calculate(UINFOArtifact uinfo) { + public CalculationResult calculate(final UINFOArtifact uinfo) { final Calculation problems = new Calculation(); final String calcModeLabel = Resources.getMsg(this.context.getMeta(), uinfo.getCalculationMode().name()); @@ -45,21 +45,27 @@ final RiverAccess access = new RiverAccess(uinfo); final River river = access.getRiver(); - DoubleRange calcRange = null; + final DoubleRange calcRange = null; final RiverInfo riverInfo = new RiverInfo(river); - + + final InundationDurationAccess indurax = new InundationDurationAccess(uinfo); + final int[] totalEpoch = indurax.getTotalEpoch(); + final Integer year = indurax.getYear(); // null bei year -> Integer.. evtl ungünstig.. evtl. anders lösen + final DoubleRange range = indurax.getRange(); + final Double sedimentHeight = indurax.getSedimentHeight(); + final InundationDurationCalculationResults results = new InundationDurationCalculationResults(calcModeLabel, user, riverInfo, calcRange); - final Collection<ResultRow> rows = new ArrayList<ResultRow>(); - - final ResultRow row1 = ResultRow.create(). // + final Collection<ResultRow> rows = new ArrayList<>(); + + final ResultRow row1 = ResultRow.create(). // putValue(SInfoResultType.discharge, 100). // - putValue(SInfoResultType.waterlevel, 2). // - putValue(SInfoResultType.gaugeLabel, "Torgau"); + putValue(SInfoResultType.waterlevel, 2). // + putValue(SInfoResultType.gaugeLabel, "Torgau"); rows.add(row1); - ResultRow row2 = ResultRow.create(). // + final ResultRow row2 = ResultRow.create(). // putValue(SInfoResultType.discharge, 200). // putValue(SInfoResultType.waterlevel, 3). // putValue(SInfoResultType.gaugeLabel, "Zollenspieker"); @@ -67,9 +73,9 @@ rows.add(row2); final InundationDurationCalculationResult result = new InundationDurationCalculationResult("Ergebnis 1", null, rows); - + results.addResult(result, problems); - + return new CalculationResult(results, problems); } } \ No newline at end of file