Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculationResult.java @ 9215:0fc9c82e744e
work on collison, flood_duration
author | gernotbelger |
---|---|
date | Tue, 03 Jul 2018 17:00:48 +0200 |
parents | 53cc5b496692 |
children | 4e6111f87dda |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculationResult.java Tue Jul 03 14:26:56 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCalculationResult.java Tue Jul 03 17:00:48 2018 +0200 @@ -15,7 +15,6 @@ import java.util.Collections; import java.util.List; -import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; import org.dive4elements.river.artifacts.common.AbstractCalculationExportableResult; import org.dive4elements.river.artifacts.common.AbstractExportContext; import org.dive4elements.river.artifacts.common.ExportContextCSV; @@ -47,7 +46,7 @@ private final int maxWaterlevelPdf = 3; public interface ValueGetter { - abstract double getValue(DurationWaterlevel waterlevel); + double getValue(DurationWaterlevel waterlevel); } private enum ExportMode { @@ -56,7 +55,7 @@ public FloodDurationCalculationResult(final String label, final String[] mainvalueLabels, final Collection<ResultRow> rows) { super(label, rows); - this.mainvalueLabels = mainvalueLabels; // TODO: löschen (?) + this.mainvalueLabels = mainvalueLabels; this.waterlevelCount = mainvalueLabels.length; } @@ -279,9 +278,7 @@ return ""; } - public final double[][] getMainValueDurationPoints(final DiagramGenerator generator, final ArtifactAndFacet bundle, - // final Function<DurationWaterlevel, Double> valueGetter - final ValueGetter valuegetter, final int dataIndex) { + public final double[][] getMainValueDurationPoints(final DiagramGenerator generator, final ValueGetter valuegetter, final int dataIndex) { final TDoubleArrayList xPoints = new TDoubleArrayList(this.rows.size()); final TDoubleArrayList yPoints = new TDoubleArrayList(this.rows.size());