Mercurial > dive4elements > river
changeset 9339:f812880963a9
Fixed: d50 interpolation always with complete river range
| author | mschaefer |
|---|---|
| date | Mon, 30 Jul 2018 10:23:48 +0200 |
| parents | 4624846c19fb |
| children | 85d08fb28d96 0c621beceb2f |
| files | artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhcalculation/BedQualityD50KmValueFinder.java |
| diffstat | 1 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhcalculation/BedQualityD50KmValueFinder.java Mon Jul 30 10:14:46 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhcalculation/BedQualityD50KmValueFinder.java Mon Jul 30 10:23:48 2018 +0200 @@ -62,11 +62,16 @@ + " 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)" + + " WHERE (g.name = :name)" + " AND (p.tiefevon > 0.0) AND (p.tiefebis <= 0.5)" + " AND (t.datum BETWEEN :fromdate AND :todate)" + " ORDER BY s.km ASC, a.d50 ASC"; + // + " 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 s.km ASC, a.d50 ASC"; + private Calculation problems; /** @@ -111,8 +116,8 @@ .addScalar("datum", StandardBasicTypes.DATE).addScalar("tiefevon", StandardBasicTypes.DOUBLE).addScalar("tiefebis", StandardBasicTypes.DOUBLE) .addScalar("d50", StandardBasicTypes.DOUBLE); sqlQuery.setString("name", seddbRiver); - sqlQuery.setDouble("fromkm", kmRange.getMinimumDouble()); - sqlQuery.setDouble("tokm", kmRange.getMaximumDouble()); + // sqlQuery.setDouble("fromkm", kmRange.getMinimumDouble()); + // sqlQuery.setDouble("tokm", kmRange.getMaximumDouble()); sqlQuery.setDate("fromdate", startTime); sqlQuery.setDate("todate", endTime);