# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1345642731 0
# Node ID e0f54fab55d3855ec5108848ab0875a66bc35307
# Parent  2b308a5d528114f0cf5b40641d4a349318bb468b
FixA: Generate indices for each analysis periods.

flys-artifacts/trunk@5236 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 2b308a5d5281 -r e0f54fab55d3 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Wed Aug 22 12:25:28 2012 +0000
+++ b/flys-artifacts/ChangeLog	Wed Aug 22 13:38:51 2012 +0000
@@ -1,3 +1,8 @@
+2012-08-22	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisCalculation.java:
+	  Each analysis period has its own index scheme now.
+
 2012-08-22	Christian Lins	<christian.lins@intevation.de>
 
 	* src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java:
diff -r 2b308a5d5281 -r e0f54fab55d3 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisCalculation.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisCalculation.java	Wed Aug 22 12:25:28 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisCalculation.java	Wed Aug 22 13:38:51 2012 +0000
@@ -129,8 +129,12 @@
 
         IdsFilter idsFilter = new IdsFilter(events);
 
-        HashMap<Integer, Integer> col2index = new HashMap<Integer, Integer>();
+        ArrayList<HashMap<Integer, Integer>> col2indices =
+            new ArrayList<HashMap<Integer, Integer>>(analysisPeriods.length);
 
+        for (int i = 0; i < analysisPeriods.length; ++i) {
+            col2indices.add(new HashMap<Integer, Integer>());
+        }
 
         for (int row = 0, R = parameters.size(); row < R; ++row) {
             double km = parameters.get(row, kmIndex);
@@ -145,7 +149,10 @@
             ArrayList<AnalysisPeriod> periodResults =
                 new ArrayList<AnalysisPeriod>(analysisPeriods.length);
 
-            for (DateRange analysisPeriod: analysisPeriods) {
+            for (int ap = 0; ap < analysisPeriods.length; ++ap) {
+                DateRange analysisPeriod = analysisPeriods[ap];
+                HashMap<Integer, Integer> col2index = col2indices.get(ap);
+
                 DateRangeFilter drf = new DateRangeFilter(
                     analysisPeriod.getFrom(),
                     analysisPeriod.getTo());