# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1339585997 0
# Node ID 4c22194b733a7f36fc4cdfce8bd7d5df1909c453
# Parent  ee653971fa8449eba4495c2e54cc3ddcb2bea7d5
Some minor bugfixes in fix analysis calculation and some more debug output.

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

diff -r ee653971fa84 -r 4c22194b733a flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Wed Jun 13 10:19:44 2012 +0000
+++ b/flys-artifacts/ChangeLog	Wed Jun 13 11:13:17 2012 +0000
@@ -1,3 +1,14 @@
+2012-06-13  Ingo Weinzierl <ingo@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/model/fixings/FixAvSectorFacet.java:
+	  Added more debug/warn log statements.
+
+	* src/main/java/de/intevation/flys/artifacts/model/fixings/Fitting.java: Do
+	  not add empty objects into the calculation result.
+
+	* src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java:
+	  Take care on empty QWD objects.
+
 2012-06-11	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/model/fixings/Fitting.java,
diff -r ee653971fa84 -r 4c22194b733a flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/Fitting.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/Fitting.java	Wed Jun 13 10:19:44 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/Fitting.java	Wed Jun 13 11:13:17 2012 +0000
@@ -205,7 +205,14 @@
 
         referenced = new QW[xs.size()];
         for (int i = 0; i < referenced.length; ++i) {
-            referenced[i] = qwFactory.create(xs.getQuick(i), ys.getQuick(i));
+            QW qw = qwFactory.create(xs.getQuick(i), ys.getQuick(i));
+
+            if (qw == null) {
+                log.warn("QW creation failed!");
+            }
+            else {
+                referenced[i] = qw;
+            }
         }
 
         chiSqr = lmo.getChiSquare();
diff -r ee653971fa84 -r 4c22194b733a flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAvSectorFacet.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAvSectorFacet.java	Wed Jun 13 10:19:44 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAvSectorFacet.java	Wed Jun 13 11:13:17 2012 +0000
@@ -70,24 +70,35 @@
 
             double km = access.getCurrentKm();
 
+            logger.debug("Current KM = " + km);
+
             KMIndex<AnalysisPeriod []> kmPeriods = result.getAnalysisPeriods();
             KMIndex.Entry<AnalysisPeriod []> kmPeriodsEntry =
                 kmPeriods.search(km);
 
             if (kmPeriodsEntry == null) {
+                logger.warn("No analysis periods found for km '" + km + "'");
                 return null;
             }
 
             AnalysisPeriod[] periods = kmPeriodsEntry.getValue();
 
             if (periods == null) {
+                logger.warn("No analysis periods specified!");
                 return null;
             }
+
             QWD[] qwdData = periods[index].getQSectorAverages();
+
+            if (logger.isDebugEnabled()) {
+                int resSize = qwdData != null ? qwdData.length : -1;
+                logger.debug("Found " + resSize + " result elements.");
+            }
+
             return qwdData;
         }
         else {
-            logger.debug("Not an instance of FixationArtifact.");
+            logger.warn("Artifact is no instance of FLYSArtifact.");
             return null;
         }
     }
diff -r ee653971fa84 -r 4c22194b733a flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java	Wed Jun 13 10:19:44 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java	Wed Jun 13 11:13:17 2012 +0000
@@ -97,7 +97,9 @@
         if(qwds != null) {
             // Draw vertical markers
             for(QWD qwd : qwds) {
-                addDomainMarker(new ValueMarker(qwd.getQ()));
+                if (qwd != null) {
+                    addDomainMarker(new ValueMarker(qwd.getQ()));
+                }
             }
         }
     }