Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/AbstractTkhCalculationResult.java @ 9170:9b2e46090099
tkh cast exception fix
gigantic refactoring 2
author | gernotbelger |
---|---|
date | Thu, 21 Jun 2018 14:32:11 +0200 |
parents | 50cc99579a46 |
children | a4121ec450d6 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/AbstractTkhCalculationResult.java Thu Jun 21 10:41:55 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/AbstractTkhCalculationResult.java Thu Jun 21 14:32:11 2018 +0200 @@ -12,6 +12,8 @@ import java.util.Collection; import java.util.List; +import org.dive4elements.river.artifacts.common.AbstractCalculationExportableResult; +import org.dive4elements.river.artifacts.common.AbstractCalculationResults; import org.dive4elements.river.artifacts.common.ResultRow; import org.dive4elements.river.artifacts.sinfo.tkhcalculation.SoilKind; import org.dive4elements.river.artifacts.sinfo.util.WstInfo; @@ -21,15 +23,17 @@ /** * @author Gernot Belger */ -public abstract class AbstractTkhCalculationResult extends AbstractSInfoCalculationResult { + +public abstract class AbstractTkhCalculationResult<RESULTS extends AbstractCalculationResults<?>> extends AbstractCalculationExportableResult<RESULTS> { private static final long serialVersionUID = 1L; private final boolean hasTkh; + private final WstInfo wst; public AbstractTkhCalculationResult(final String label, final WstInfo wst, final boolean hasTkh, final Collection<ResultRow> rows) { - super(label, wst, rows); - + super(label, rows); + this.wst = wst; this.hasTkh = hasTkh; } @@ -100,4 +104,8 @@ return new double[][] { adjustedX.toNativeArray(), adjustedY.toNativeArray() }; } + + public final WstInfo getWst() { + return this.wst; // TODO: Meta-Data export hier hin + } } \ No newline at end of file