Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/AbstractSInfoResultRow.java @ 8946:5d5d482da3e9
Implementing SINFO - FlowDepthMinMax calculation
author | gernotbelger |
---|---|
date | Tue, 13 Mar 2018 18:49:33 +0100 |
parents | 82998242ba84 |
children |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/AbstractSInfoResultRow.java Tue Mar 13 09:55:53 2018 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/AbstractSInfoResultRow.java Tue Mar 13 18:49:33 2018 +0100 @@ -11,9 +11,6 @@ import java.io.Serializable; -import org.dive4elements.river.artifacts.sinfo.tkhcalculation.SoilKind; -import org.dive4elements.river.artifacts.sinfo.tkhcalculation.Tkh; - /** * Contains common result data of flow-depth- and tkh-calculations. * @@ -22,49 +19,18 @@ public abstract class AbstractSInfoResultRow implements Serializable { private static final long serialVersionUID = 1L; - private final Tkh tkh; - private final String waterlevelLabel; private final String gauge; private final String location; - public AbstractSInfoResultRow(final Tkh tkh, final String waterlevelLabel, final String gauge, final String location) { - this.tkh = tkh; + public AbstractSInfoResultRow(final String waterlevelLabel, final String gauge, final String location) { this.waterlevelLabel = waterlevelLabel; this.gauge = gauge; this.location = location; } - public final double getStation() { - return this.tkh.getStation(); - } - - public final SoilKind getTkhKind() { - return this.tkh.getKind(); - } - - public final double getTkh() { - return this.tkh.getTkh(); - } - - public final double getTkhUp() { - return this.tkh.getUp(); - } - - public final double getTkhDown() { - return this.tkh.getDown(); - } - - public final double getWaterlevel() { - return this.tkh.getWaterlevel(); - } - - public final double getDischarge() { - return this.tkh.getDischarge(); - } - public final String getWaterlevelLabel() { return this.waterlevelLabel; } @@ -73,30 +39,6 @@ return this.gauge; } - public final double getMeanBedHeight() { - return this.tkh.getMeanBedHeight(); - } - - public final double getFlowDepth() { - return this.tkh.getFlowDepth(); - } - - public double getFlowDepthWithTkh() { - return this.tkh.getFlowDepthTkh(); - } - - public double getVelocity() { - return this.tkh.getVelocity(); - } - - public double getD50() { - return this.tkh.getD50(); - } - - public double getTau() { - return this.tkh.getTau(); - } - public final String getLocation() { return this.location; }