diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepthdev/FlowDepthDevelopmentCalculation.java @ 8997:d5802f22e4f5

Work on uinfo
author gernotbelger
date Thu, 12 Apr 2018 19:14:19 +0200
parents b194fa64506a
children 5294114b1df4
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepthdev/FlowDepthDevelopmentCalculation.java	Thu Apr 12 19:13:39 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepthdev/FlowDepthDevelopmentCalculation.java	Thu Apr 12 19:14:19 2018 +0200
@@ -15,13 +15,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;
@@ -142,7 +143,7 @@
         final double diffYear = currentMeanYear - historcialMeanYear;
 
         /* real calculation loop */
-        final Collection<SInfoResultRow> rows = new ArrayList<>();
+        final Collection< ResultRow> rows = new ArrayList<>();
 
         final Collection<Double> stations = determineCalculationSteps(currentSounding, historicalSounding);
         for (final double station : stations) {
@@ -171,8 +172,8 @@
                 // REMARK: access the location once only during calculation
                 final String location = currentRiverInfoProvider.getLocation(station);
 
-                final SInfoResultRow row = SInfoResultRow.create().//
-                        putValue(SInfoResultType.station, station). //
+                final ResultRow row =  ResultRow.create().//
+                        putValue(GeneralResultType.station, station). //
                         putValue(SInfoResultType.flowdepthDevelopment, flowDepthDevelopment). //
                         putValue(SInfoResultType.flowdepthDevelopmentPerYear, flowDepthDevelopmentPerYear). //
                         putValue(SInfoResultType.waterlevelDifference, diffWst). //

http://dive4elements.wald.intevation.org