Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhcalculation/BedQualityD50KmValueFinder.java @ 9339:f812880963a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed: d50 interpolation always with complete river range
author mschaefer
date Mon, 30 Jul 2018 10:23:48 +0200
parents e07a2b4606c1
children c01f1e65903b
comparison
equal deleted inserted replaced
9338:4624846c19fb 9339:f812880963a9
60 "SELECT s.km, t.datum, p.tiefevon, p.tiefebis, a.d50" 60 "SELECT s.km, t.datum, p.tiefevon, p.tiefebis, a.d50"
61 + " FROM sohltest t INNER JOIN station s ON t.stationid = s.stationid" 61 + " FROM sohltest t INNER JOIN station s ON t.stationid = s.stationid"
62 + " INNER JOIN gewaesser g ON s.gewaesserid = g.gewaesserid" 62 + " INNER JOIN gewaesser g ON s.gewaesserid = g.gewaesserid"
63 + " INNER JOIN sohlprobe p ON t.sohltestid = p.sohltestid" 63 + " INNER JOIN sohlprobe p ON t.sohltestid = p.sohltestid"
64 + " INNER JOIN siebanalyse a ON p.sohlprobeid = a.sohlprobeid" 64 + " INNER JOIN siebanalyse a ON p.sohlprobeid = a.sohlprobeid"
65 + " WHERE (g.name = :name) AND (s.km BETWEEN :fromkm - 0.0001 AND :tokm + 0.0001)" 65 + " WHERE (g.name = :name)"
66 + " AND (p.tiefevon > 0.0) AND (p.tiefebis <= 0.5)" 66 + " AND (p.tiefevon > 0.0) AND (p.tiefebis <= 0.5)"
67 + " AND (t.datum BETWEEN :fromdate AND :todate)" 67 + " AND (t.datum BETWEEN :fromdate AND :todate)"
68 + " ORDER BY s.km ASC, a.d50 ASC"; 68 + " ORDER BY s.km ASC, a.d50 ASC";
69
70 // + " WHERE (g.name = :name) AND (s.km BETWEEN :fromkm - 0.0001 AND :tokm + 0.0001)"
71 // + " AND (p.tiefevon > 0.0) AND (p.tiefebis <= 0.5)"
72 // + " AND (t.datum BETWEEN :fromdate AND :todate)"
73 // + " ORDER BY s.km ASC, a.d50 ASC";
69 74
70 private Calculation problems; 75 private Calculation problems;
71 76
72 /** 77 /**
73 * Real linear interpolator for kms and d50 values (m) 78 * Real linear interpolator for kms and d50 values (m)
109 final Session session = SedDBSessionHolder.HOLDER.get(); 114 final Session session = SedDBSessionHolder.HOLDER.get();
110 final SQLQuery sqlQuery = session.createSQLQuery(SQL_BED_D50_SUBLAYER_MEASUREMENT).addScalar("km", StandardBasicTypes.DOUBLE) 115 final SQLQuery sqlQuery = session.createSQLQuery(SQL_BED_D50_SUBLAYER_MEASUREMENT).addScalar("km", StandardBasicTypes.DOUBLE)
111 .addScalar("datum", StandardBasicTypes.DATE).addScalar("tiefevon", StandardBasicTypes.DOUBLE).addScalar("tiefebis", StandardBasicTypes.DOUBLE) 116 .addScalar("datum", StandardBasicTypes.DATE).addScalar("tiefevon", StandardBasicTypes.DOUBLE).addScalar("tiefebis", StandardBasicTypes.DOUBLE)
112 .addScalar("d50", StandardBasicTypes.DOUBLE); 117 .addScalar("d50", StandardBasicTypes.DOUBLE);
113 sqlQuery.setString("name", seddbRiver); 118 sqlQuery.setString("name", seddbRiver);
114 sqlQuery.setDouble("fromkm", kmRange.getMinimumDouble()); 119 // sqlQuery.setDouble("fromkm", kmRange.getMinimumDouble());
115 sqlQuery.setDouble("tokm", kmRange.getMaximumDouble()); 120 // sqlQuery.setDouble("tokm", kmRange.getMaximumDouble());
116 sqlQuery.setDate("fromdate", startTime); 121 sqlQuery.setDate("fromdate", startTime);
117 sqlQuery.setDate("todate", endTime); 122 sqlQuery.setDate("todate", endTime);
118 123
119 final List<Object[]> rows = sqlQuery.list(); 124 final List<Object[]> rows = sqlQuery.list();
120 final TDoubleArrayList kms = new TDoubleArrayList(); 125 final TDoubleArrayList kms = new TDoubleArrayList();
http://dive4elements.wald.intevation.org