diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepthminmax/FlowDepthMinMaxCalculation.java @ 8997:d5802f22e4f5

Work on uinfo
author gernotbelger
date Thu, 12 Apr 2018 19:14:19 +0200
parents 0adc6d04de95
children 740d65e4aa14
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepthminmax/FlowDepthMinMaxCalculation.java	Thu Apr 12 19:13:39 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepthminmax/FlowDepthMinMaxCalculation.java	Thu Apr 12 19:14:19 2018 +0200
@@ -14,13 +14,14 @@
 
 import org.apache.commons.lang.math.DoubleRange;
 import org.dive4elements.artifacts.CallContext;
+import org.dive4elements.river.artifacts.common.GeneralResultType;
+import org.dive4elements.river.artifacts.common.ResultRow;
 import org.dive4elements.river.artifacts.model.Calculation;
 import org.dive4elements.river.artifacts.model.CalculationResult;
 import org.dive4elements.river.artifacts.model.WKms;
 import org.dive4elements.river.artifacts.resources.Resources;
 import org.dive4elements.river.artifacts.sinfo.SINFOArtifact;
 import org.dive4elements.river.artifacts.sinfo.common.RiverInfoProvider;
-import org.dive4elements.river.artifacts.sinfo.common.SInfoResultRow;
 import org.dive4elements.river.artifacts.sinfo.common.SInfoResultType;
 import org.dive4elements.river.artifacts.sinfo.flowdepth.FlowDepthUtils;
 import org.dive4elements.river.artifacts.sinfo.flowdepth.WstSoundingIdPair;
@@ -120,7 +121,7 @@
         final String soundingLabel = bedHeightInfo.getDescription();
 
         /* real calculation loop */
-        final Collection<SInfoResultRow> rows = new ArrayList<>();
+        final Collection< ResultRow> rows = new ArrayList<>();
 
         final Collection<Double> stations = bedHeight.getStations();
         for (final double station : stations) {
@@ -146,8 +147,8 @@
                 if (Double.isNaN(wst) || Double.isNaN(minBedHeightValue) || Double.isNaN(maxBedHeightValue))
                     continue;
 
-                final SInfoResultRow row = SInfoResultRow.create().//
-                        putValue(SInfoResultType.station, station). //
+                final  ResultRow row =  ResultRow.create().//
+                        putValue(GeneralResultType.station, station). //
                         putValue(SInfoResultType.flowdepthmin, minFlowDepth). //
                         putValue(SInfoResultType.flowdepthmax, maxFlowDepth). //
                         putValue(SInfoResultType.waterlevel, wst). //

http://dive4elements.wald.intevation.org