dive4elements/river: artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixAnalysisResult.java comparison

Fix for flys/issue1479: The indices of the dates of the analysis periods where re-mapped wrong.

author	Sascha L. Teichmann <teichmann@intevation.de>
date	Thu, 12 Sep 2013 16:35:07 +0200
parents	8efef772a488
children	a3f318347707 0a5239a1e46e

comparison

equal deleted inserted replaced

-:e96d3f6c7c42
+:3e93f29281bc
 * and comes with ABSOLUTELY NO WARRANTY! Check out the
 * documentation coming with Dive4Elements River for details.
 */
 package org.dive4elements.river.artifacts.model.fixings;
+import gnu.trove.TIntObjectHashMap;
 import java.util.Collection;
 import java.util.Date;
 import java.util.TreeMap;
 import java.util.TreeSet;
 return result;
 }
 public void makeAnalysisEventsUnique() {
-// Actually it would be enough to make dates
+TIntObjectHashMap dums = new TIntObjectHashMap();
-// unique in one analysis period but to simplify things
-// we make them unique in all periods.
-DateUniqueMaker dum = new DateUniqueMaker();
 for (KMIndex.Entry<AnalysisPeriod []> entry: analysisPeriods) {
-for (AnalysisPeriod ap: entry.getValue()) {
+AnalysisPeriod [] aps = entry.getValue();
+for (int i = 0; i < aps.length; ++i) {
+AnalysisPeriod ap = aps[i];
 QWD [] qwds = ap.getQWDs();
-if (qwds != null) {
+if (qwds == null) {
-for (QWD qwd: qwds) {
+continue;
-dum.makeUnique(qwd);
+}
-}
+DateUniqueMaker dum = (DateUniqueMaker)dums.get(i);
+if (dum == null) {
+dums.put(i, dum = new DateUniqueMaker());
+}
+for (QWD qwd: qwds) {
+dum.makeUnique(qwd);
 }
 }
 }
 }

Mercurial > dive4elements > river