diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixAnalysisCalculation.java @ 9479:2b83d3a96703

i18n TODO "benutzerdefiniert" = "custom" fixed
author gernotbelger
date Mon, 10 Sep 2018 15:31:55 +0200
parents 9744ce3c3853
children
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixAnalysisCalculation.java	Mon Sep 10 14:21:36 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixAnalysisCalculation.java	Mon Sep 10 15:31:55 2018 +0200
@@ -14,6 +14,7 @@
 
 import org.apache.commons.math.stat.descriptive.moment.StandardDeviation;
 import org.apache.log4j.Logger;
+import org.dive4elements.artifacts.CallMeta;
 import org.dive4elements.river.artifacts.access.FixAnalysisAccess;
 import org.dive4elements.river.artifacts.math.fitting.Function;
 import org.dive4elements.river.artifacts.model.CalculationResult;
@@ -65,10 +66,10 @@
     }
 
     @Override
-    public CalculationResult innerCalculate(final FixingsOverview overview, final Function func) {
+    protected CalculationResult innerCalculate(final FixingsOverview overview, final Function function, final CallMeta meta) {
         final ColumnCache cc = new ColumnCache();
 
-        final FitResult fitResult = doFitting(overview, cc, func);
+        final FitResult fitResult = doFitting(overview, cc, function);
 
         if (fitResult == null)
             return new CalculationResult(this);
@@ -78,7 +79,7 @@
         final AnalysisPeriodEventResults eventResults = new AnalysisPeriodEventResults();
         final KMIndex<AnalysisPeriod[]> kmResults = new KMIndex<>(parameters.size());
 
-        calculateAnalysisPeriods(func, parameters, overview, cc, eventResults, kmResults);
+        calculateAnalysisPeriods(function, parameters, overview, cc, eventResults, kmResults);
         eventResults.sortAll();
         kmResults.sort();
 
@@ -259,4 +260,5 @@
             kmResults.add(km, rap);
         }
     }
+
 }
\ No newline at end of file

http://dive4elements.wald.intevation.org