comparison 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
comparison
equal deleted inserted replaced
9169:1f94b3673ed3 9170:9b2e46090099
10 package org.dive4elements.river.artifacts.sinfo.common; 10 package org.dive4elements.river.artifacts.sinfo.common;
11 11
12 import java.util.Collection; 12 import java.util.Collection;
13 import java.util.List; 13 import java.util.List;
14 14
15 import org.dive4elements.river.artifacts.common.AbstractCalculationExportableResult;
16 import org.dive4elements.river.artifacts.common.AbstractCalculationResults;
15 import org.dive4elements.river.artifacts.common.ResultRow; 17 import org.dive4elements.river.artifacts.common.ResultRow;
16 import org.dive4elements.river.artifacts.sinfo.tkhcalculation.SoilKind; 18 import org.dive4elements.river.artifacts.sinfo.tkhcalculation.SoilKind;
17 import org.dive4elements.river.artifacts.sinfo.util.WstInfo; 19 import org.dive4elements.river.artifacts.sinfo.util.WstInfo;
18 20
19 import gnu.trove.TDoubleArrayList; 21 import gnu.trove.TDoubleArrayList;
20 22
21 /** 23 /**
22 * @author Gernot Belger 24 * @author Gernot Belger
23 */ 25 */
24 public abstract class AbstractTkhCalculationResult extends AbstractSInfoCalculationResult { 26
27 public abstract class AbstractTkhCalculationResult<RESULTS extends AbstractCalculationResults<?>> extends AbstractCalculationExportableResult<RESULTS> {
25 28
26 private static final long serialVersionUID = 1L; 29 private static final long serialVersionUID = 1L;
27 30
28 private final boolean hasTkh; 31 private final boolean hasTkh;
32 private final WstInfo wst;
29 33
30 public AbstractTkhCalculationResult(final String label, final WstInfo wst, final boolean hasTkh, final Collection<ResultRow> rows) { 34 public AbstractTkhCalculationResult(final String label, final WstInfo wst, final boolean hasTkh, final Collection<ResultRow> rows) {
31 super(label, wst, rows); 35 super(label, rows);
32 36 this.wst = wst;
33 this.hasTkh = hasTkh; 37 this.hasTkh = hasTkh;
34 } 38 }
35 39
36 public final boolean hasTkh() { 40 public final boolean hasTkh() {
37 return this.hasTkh; 41 return this.hasTkh;
98 adjustedY.add(yPoints[i]); 102 adjustedY.add(yPoints[i]);
99 } 103 }
100 104
101 return new double[][] { adjustedX.toNativeArray(), adjustedY.toNativeArray() }; 105 return new double[][] { adjustedX.toNativeArray(), adjustedY.toNativeArray() };
102 } 106 }
107
108 public final WstInfo getWst() {
109 return this.wst; // TODO: Meta-Data export hier hin
110 }
103 } 111 }

http://dive4elements.wald.intevation.org