[PATCH] Fixed: d50 interpolation always with complete river range
Wald Commits
scm-commit at wald.intevation.org
Mon Jul 30 10:24:04 CEST 2018
# HG changeset patch
# User mschaefer
# Date 1532939028 -7200
# Node ID f812880963a90fa6a99bebcb6dc8f6e14a533474
# Parent 4624846c19fbe6a472413d707745c8f3385dbf71
Fixed: d50 interpolation always with complete river range
diff -r 4624846c19fb -r f812880963a9 artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhcalculation/BedQualityD50KmValueFinder.java
--- 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);
More information about the Dive4Elements-commits
mailing list