Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisCalculation.java @ 3603:d2ae58f6730d
FixA: Use the column cache to establish a consistent index scheme.
flys-artifacts/trunk@5229 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Wed, 22 Aug 2012 10:51:29 +0000 |
parents | e111902834d3 |
children | 2382b26079ac |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisCalculation.java Wed Aug 22 10:18:00 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisCalculation.java Wed Aug 22 10:51:29 2012 +0000 @@ -68,7 +68,9 @@ FixingsOverview overview, Function func ) { - FitResult fitResult = doFitting(overview, func); + ColumnCache cc = new ColumnCache(); + + FitResult fitResult = doFitting(overview, cc, func); if (fitResult == null) { return new CalculationResult(this); @@ -78,7 +80,8 @@ calculateAnalysisPeriods( func, fitResult.getParameters(), - overview); + overview, + cc); analysisPeriods.sort(); @@ -103,15 +106,14 @@ protected KMIndex<AnalysisPeriod []> calculateAnalysisPeriods( Function function, Parameters parameters, - FixingsOverview overview + FixingsOverview overview, + ColumnCache cc ) { Range range = new Range(from, to); int kmIndex = parameters.columnIndex("km"); int maxQIndex = parameters.columnIndex("max_q"); - ColumnCache cc = new ColumnCache(); - double [] wq = new double[2]; int [] parameterIndices =