Mercurial > dive4elements > river
changeset 4006:d4e39cc5c10c
S(Q) relation: Removed unused field from SQL statement.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Mon, 01 Oct 2012 18:39:48 +0200 |
| parents | 22abdc45869c |
| children | d4d272e56d3a |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java |
| diffstat | 3 files changed, 12 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Mon Oct 01 18:32:27 2012 +0200 +++ b/flys-artifacts/ChangeLog Mon Oct 01 18:39:48 2012 +0200 @@ -1,3 +1,11 @@ +2012-10-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java: + Fixed typo. + + * flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: + Removed unused field from SQL query. + 2012-10-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> Finally calculate the S(Q) fractions. TODO: Split SQL into two queries.
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java Mon Oct 01 18:32:27 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java Mon Oct 01 18:39:48 2012 +0200 @@ -161,7 +161,7 @@ Sieve four = findSieve(4d); if (six == null || ten == null || four == null) { - log.warn("missind diameter"); + log.warn("missing diameter"); return; }
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java Mon Oct 01 18:32:27 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java Mon Oct 01 18:39:48 2012 +0200 @@ -36,8 +36,6 @@ "g.UFERABLINKS AS UFERABLINKS," + "m.TSCHWEB AS TSCHWEB," + "m.TSAND AS TSAND," + - "gp.MESSDAUER AS MESSDAUER," + - "gp.MENGE AS MENGE," + "gp.GTRIEB AS GTRIEB," + "m.TGESCHIEBE AS TGESCHIEBE," + "sie.SIEB01 AS SIEB01," + @@ -184,8 +182,6 @@ .addScalar("UFERABLINKS", StandardBasicTypes.DOUBLE) .addScalar("TSCHWEB", StandardBasicTypes.DOUBLE) .addScalar("TSAND", StandardBasicTypes.DOUBLE) - .addScalar("MESSDAUER", StandardBasicTypes.DOUBLE) - .addScalar("MENGE", StandardBasicTypes.DOUBLE) .addScalar("GTRIEB", StandardBasicTypes.DOUBLE) .addScalar("TGESCHIEBE", StandardBasicTypes.DOUBLE) .addScalar("RSIEB01", StandardBasicTypes.DOUBLE) @@ -240,7 +236,7 @@ query.setResultTransformer(MeasurementResultTransformer.INSTANCE); @SuppressWarnings("unchecked") - List<Measurement> measuments = (List<Measurement>)query.list(); + List<Measurement> measuments = (List<Measurement>)query.list(); List<Measurement> same = new ArrayList<Measurement>(); @@ -376,8 +372,8 @@ Calendar cb = Calendar.getInstance(); ca.setTime(a); cb.setTime(b); - return ca.get(Calendar.YEAR) == cb.get(Calendar.YEAR) - && ca.get(Calendar.MONTH) == cb.get(Calendar.MONTH) + return ca.get(Calendar.YEAR) == cb.get(Calendar.YEAR) + && ca.get(Calendar.MONTH) == cb.get(Calendar.MONTH) && ca.get(Calendar.DAY_OF_MONTH) == cb.get(Calendar.DAY_OF_MONTH); }