Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthRow.java @ 8915:d9dbf0b74bc2
Refaktoring of flow depth calculation, extracting tkh part. First implementation of tkh calculation.
author | gernotbelger |
---|---|
date | Wed, 28 Feb 2018 17:27:15 +0100 |
parents | cc86b0f9b3c3 |
children | 82998242ba84 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthRow.java Tue Feb 27 18:06:52 2018 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthRow.java Wed Feb 28 17:27:15 2018 +0100 @@ -9,66 +9,31 @@ */ package org.dive4elements.river.artifacts.sinfo.flowdepth; -import java.io.Serializable; +import org.dive4elements.river.artifacts.sinfo.common.AbstractSInfoResultRow; +import org.dive4elements.river.artifacts.sinfo.tkhcalculation.Tkh; /** * Part of {@link FlowDepthCalculationResult} which represents one calculated row of flow depth data. * * @author Gernot Belger */ -final class FlowDepthRow implements Serializable { +final class FlowDepthRow extends AbstractSInfoResultRow { private static final long serialVersionUID = 1L; - private final double station; - private final double flowDepth; private final double flowDepthWithTkh; - private final SoilKind tkhKind; - - private final double tkh; - - private final double tkhUp; - - private final double tkhDown; - - private final double waterlevel; - - private final double discharge; + private final String soundingLabel; - private final String waterlevelLabel; - - private final String gauge; - - private final double meanBedHeight; + public FlowDepthRow(final double flowDepth, final double flowDepthWithTkh, final Tkh tkh, final String waterlevelLabel, + final String gauge, final String soundingLabel, final String location) { - private final String soundageLabel; - - private final String location; + super(tkh, waterlevelLabel, gauge, location); - public FlowDepthRow(final double station, final double flowDepth, final double flowDepthWithTkh, final SoilKind tkhKind, final double tkh, - final double tkhUp, final double tkhDown, - final double waterlevel, final double discharge, final String waterlevelLabel, final String gauge, final double meanBedHeight, - final String soundageLabel, final String location) { - this.station = station; this.flowDepth = flowDepth; this.flowDepthWithTkh = flowDepthWithTkh; - this.tkhKind = tkhKind; - this.tkh = tkh; - this.tkhUp = tkhUp; - this.tkhDown = tkhDown; - this.waterlevel = waterlevel; - this.discharge = discharge; - this.waterlevelLabel = waterlevelLabel; - this.gauge = gauge; - this.meanBedHeight = meanBedHeight; - this.soundageLabel = soundageLabel; - this.location = location; - } - - public double getStation() { - return this.station; + this.soundingLabel = soundingLabel; } public double getFlowDepth() { @@ -79,47 +44,7 @@ return this.flowDepthWithTkh; } - public SoilKind getTkhKind() { - return this.tkhKind; - } - - public double getTkh() { - return this.tkh; - } - - public double getTkhUp() { - return this.tkhUp; - } - - public double getTkhDown() { - return this.tkhDown; - } - - public double getWaterlevel() { - return this.waterlevel; - } - - public double getDischarge() { - return this.discharge; - } - - public String getWaterlevelLabel() { - return this.waterlevelLabel; - } - - public String getGauge() { - return this.gauge; - } - - public double getMeanBedHeight() { - return this.meanBedHeight; - } - public String getSoundageLabel() { - return this.soundageLabel; - } - - public String getLocation() { - return this.location; + return this.soundingLabel; } } \ No newline at end of file