--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhcalculation/BedQualityD50KmValueFinder.java	Wed Mar 28 17:04:20 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhcalculation/BedQualityD50KmValueFinder.java	Thu Mar 29 15:48:17 2018 +0200
@@ -20,6 +20,7 @@
 import org.apache.commons.math.analysis.polynomials.PolynomialSplineFunction;
 import org.apache.log4j.Logger;
 import org.dive4elements.river.artifacts.math.Utils;
+import org.dive4elements.river.artifacts.model.Calculation;
 import org.dive4elements.river.backend.SedDBSessionHolder;
 import org.dive4elements.river.model.River;
 import org.hibernate.SQLQuery;
@@ -51,39 +52,42 @@
      * <br />
      * A km may have bed measurements for multiple dates, multiple distances from the river bank, and multiple depth layers.
      * The query filters by km range, time period and layer (sub layer: below bed to max. 50 cm depth).<br />
-     * 
-     * If PostgreSQL would support a median aggregate function like Oracle does, the aggregation could be placed into this query.
+     *
+     * If PostgreSQL would support a median aggregate function like Oracle does, the aggregation could be placed into this
+     * query.
      */
-    private static final String SQL_BED_D50_SUBLAYER_MEASUREMENT =
-    "SELECT t.km, t.datum, p.tiefevon, p.tiefebis, a.d50"
-        + " FROM sohltest t INNER JOIN station s ON t.stationid = s.stationid"
-        + "    INNER JOIN gewaesser g ON s.gewaesserid = g.gewaesserid"
-        + "    INNER JOIN sohlprobe p ON t.sohltestid = p.sohltestid"
-        + "    INNER JOIN siebanalyse a ON p.sohlprobeid = a.sohlprobeid"
-        + " WHERE (g.name = :name) AND (s.km BETWEEN :fromkm - 0.0001 AND :tokm + 0.0001)"
-        + "    AND (p.tiefevon > 0.0) AND (p.tiefebis <= 0.5)"
-        + "    AND (t.datum BETWEEN :fromdate AND :todate)"
-        + " ORDER BY t.km ASC, a.d50 ASC";
+    private static final String SQL_BED_D50_SUBLAYER_MEASUREMENT = "SELECT t.km, t.datum, p.tiefevon, p.tiefebis, a.d50"
+            + " FROM sohltest t INNER JOIN station s ON t.stationid = s.stationid" + "    INNER JOIN gewaesser g ON s.gewaesserid = g.gewaesserid"
+            + "    INNER JOIN sohlprobe p ON t.sohltestid = p.sohltestid" + "    INNER JOIN siebanalyse a ON p.sohlprobeid = a.sohlprobeid"
+            + " WHERE (g.name = :name) AND (s.km BETWEEN :fromkm - 0.0001 AND :tokm + 0.0001)" + "    AND (p.tiefevon > 0.0) AND (p.tiefebis <= 0.5)"
+            + "    AND (t.datum BETWEEN :fromdate AND :todate)" + " ORDER BY t.km ASC, a.d50 ASC";
+
+    private Calculation problems;
 
     /**
      * Real linear interpolator for kms and d50 values (m)
      */
     private final PolynomialSplineFunction interpolator;
 
-
     /***** CONSTRUCTORS *****/
-    
-    private BedQualityD50KmValueFinder(final double[] kms, final double[] values) {
+
+    private BedQualityD50KmValueFinder(final Calculation problems, final double[] kms, final double[] values) {
+        this.problems = problems;
+
+        // FIXME: check: max distance prüfen? dann D4E-LinearInterpolator verwenden
         this.interpolator = new LinearInterpolator().interpolate(kms, values);
     }
 
     /***** METHODS *****/
-    
+
     /**
      * Sohlbeschaffenheit (D50 Korndurchmesser aus Seddb)
      * Abhängig von Peiljahr
+     *
+     * @param problems
      */
-    public static BedQualityD50KmValueFinder loadBedMeasurements(final River river, final DoubleRange kmRange, final int soundingYear, final int validYears) {
+    public static BedQualityD50KmValueFinder loadBedMeasurements(final Calculation problems, final River river, final DoubleRange kmRange,
+            final int soundingYear, final int validYears) {
 
         /* construct valid measurement time range */
         final Calendar cal = Calendar.getInstance();
@@ -98,8 +102,8 @@
         log.debug(String.format("loadValues km %.3f - %.3f %tF - %tF", kmRange.getMinimumDouble(), kmRange.getMaximumDouble(), startTime, endTime));
         final Session session = SedDBSessionHolder.HOLDER.get();
         final SQLQuery sqlQuery = session.createSQLQuery(SQL_BED_D50_SUBLAYER_MEASUREMENT).addScalar("km", StandardBasicTypes.DOUBLE)
-                .addScalar("datum", StandardBasicTypes.DATE).addScalar("tiefevon", StandardBasicTypes.DOUBLE)
-                .addScalar("tiefebis", StandardBasicTypes.DOUBLE).addScalar("d50", StandardBasicTypes.DOUBLE);
+                .addScalar("datum", StandardBasicTypes.DATE).addScalar("tiefevon", StandardBasicTypes.DOUBLE).addScalar("tiefebis", StandardBasicTypes.DOUBLE)
+                .addScalar("d50", StandardBasicTypes.DOUBLE);
         final String seddbRiver = river.nameForSeddb();
         sqlQuery.setString("name", seddbRiver);
         sqlQuery.setDouble("fromkm", kmRange.getMinimumDouble());
@@ -111,21 +115,29 @@
         final TDoubleArrayList kms = new TDoubleArrayList();
         final TDoubleArrayList values = new TDoubleArrayList();
         final TDoubleArrayList kmd50s = new TDoubleArrayList();
+
         for (int i = 0; i <= rows.size() - 1; i++) {
             kmd50s.add((double) rows.get(i)[4]);
-            if (((i == rows.size() - 1) || !Utils.epsilonEquals((double) rows.get(i)[0], (double) rows.get(i+1)[0], 0.0001))) {
-                int k = kmd50s.size() / 2;
-                values.add(((k + k < kmd50s.size()) ? kmd50s.get(k) : (kmd50s.get(k-1) + kmd50s.get(k)) / 2) / 1000);
+            if (((i == rows.size() - 1) || !Utils.epsilonEquals((double) rows.get(i)[0], (double) rows.get(i + 1)[0], 0.0001))) {
+                final int k = kmd50s.size() / 2;
+                values.add(((k + k < kmd50s.size()) ? kmd50s.get(k) : (kmd50s.get(k - 1) + kmd50s.get(k)) / 2) / 1000);
                 kms.add((double) rows.get(i)[0]);
-                log.debug(String.format("loadValues km %.3f d50(mm) %.1f count %d", kms.get(kms.size()-1), values.get(values.size()-1), kmd50s.size()));
+                log.debug(String.format("loadValues km %.3f d50(mm) %.1f count %d", kms.get(kms.size() - 1), values.get(values.size() - 1), kmd50s.size()));
                 kmd50s.clear();
+            }
         }
+
+        if (kms.size() < 2 || values.size() < 2) {
+            problems.addProblem("bedqualityd50kmvaluefinder.empty", soundingYear);
+            return null;
         }
+
         try {
-            return new BedQualityD50KmValueFinder(kms.toNativeArray(), values.toNativeArray());
+            return new BedQualityD50KmValueFinder(problems, kms.toNativeArray(), values.toNativeArray());
         }
         catch (final Exception e) {
             e.printStackTrace();
+            problems.addProblem("bedqualityd50kmvaluefinder.error", e.getLocalizedMessage());
             return null;
         }
     }
@@ -135,22 +147,20 @@
      *
      * @return d50 (m) of the km, or NaN
      */
-    public double findD50(final double km) throws ArgumentOutsideDomainException {
-        return this.interpolator.value(km);
-        /*
-         * ohne interpolation:
-         * if ((kms == null) || (kms.size() == 0))
-         * return Double.NaN;
-         * int i = kms.binarySearch(km);
-         * if (i >= 0)
-         * return values.get(i);
-         * i = -i - 1;
-         * if ((i - 1 >= 0) && Utils.epsilonEquals(km, kms.get(i - 1), 0.0001))
-         * return values.get(i - 1);
-         * else if ((i >= 0) && (i <= kms.size() - 1) && Utils.epsilonEquals(km, kms.get(i), 0.0001))
-         * return values.get(i);
-         * else
-         * return Double.NaN;
-         */
+    public double findD50(final double km) {
+        try {
+            return this.interpolator.value(km);
+        }
+        catch (final ArgumentOutsideDomainException e) {
+            e.printStackTrace();
+
+            if (this.problems != null) {
+                this.problems.addProblem(km, "bedqualityd50kmvaluefinder.missing");
+                // Report only once
+                this.problems = null;
+            }
+
+            return Double.NaN;
+        }
     }
 }
\ No newline at end of file