Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthCalculationResults.java @ 8894:a66f2a7c4f84
SINFO FlowDepth - slight code cleanup
author | gernotbelger |
---|---|
date | Thu, 15 Feb 2018 18:40:40 +0100 |
parents | 7a8c12706834 |
children | d9dbf0b74bc2 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthCalculationResults.java Thu Feb 15 13:47:19 2018 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthCalculationResults.java Thu Feb 15 18:40:40 2018 +0100 @@ -14,7 +14,8 @@ import java.util.Collections; import java.util.List; -import org.dive4elements.river.model.River; +import org.apache.commons.lang.math.DoubleRange; +import org.dive4elements.river.artifacts.sinfo.util.RiverInfo; /** * @author Gernot Belger @@ -24,25 +25,22 @@ private final List<FlowDepthCalculationResult> results = new ArrayList<>(); - private final River river; - - private final double from; - - private final double to; - - private final boolean useTkh; - private final String calcModeLabel; private final String user; - public FlowDepthCalculationResults(final String calcModeLabel, final String user, final River river, - final double from, final double to, final boolean useTkh) { + private final RiverInfo river; + + private final boolean useTkh; + + private final DoubleRange calcRange; + + public FlowDepthCalculationResults(final String calcModeLabel, final String user, final RiverInfo river, final DoubleRange calcRange, + final boolean useTkh) { this.calcModeLabel = calcModeLabel; this.user = user; this.river = river; - this.from = from; - this.to = to; + this.calcRange = calcRange; this.useTkh = useTkh; } @@ -54,16 +52,12 @@ return this.user; } - public River getRiver() { + public RiverInfo getRiver() { return this.river; } - public double getFrom() { - return this.from; - } - - public double getTo() { - return this.to; + public DoubleRange getCalcRange() { + return this.calcRange; } public boolean isUseTkh() { @@ -77,4 +71,4 @@ public List<FlowDepthCalculationResult> getResults() { return Collections.unmodifiableList(this.results); } -} +} \ No newline at end of file