Mercurial > dive4elements > river
comparison flys-artifacts/ChangeLog @ 4012:9743bf17fce3
Reverted merge-victims in ChangeLog.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Tue, 02 Oct 2012 09:34:19 +0200 |
| parents | bf687419feba |
| children | e5e1331d0440 |
comparison
equal
deleted
inserted
replaced
| 4011:bf687419feba | 4012:9743bf17fce3 |
|---|---|
| 2 | 2 |
| 3 * flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, | 3 * flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, |
| 4 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java, | 4 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java, |
| 5 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/LocationProvider.java: | 5 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/LocationProvider.java: |
| 6 Added TODOs for issue880. | 6 Added TODOs for issue880. |
| 7 | |
| 8 2012-10-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
| 9 | |
| 10 * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: | |
| 11 Totals are now fetched with separate SQL statement. Fixed join to | |
| 12 GEWAESSER table. | |
| 13 | |
| 14 2012-10-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
| 15 | |
| 16 * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: | |
| 17 Wrote fractions SQL more compact. Fixed AIOOBE. | |
| 18 | |
| 19 2012-10-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
| 20 | |
| 21 * src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java: | |
| 22 Fixed typo. | |
| 23 | |
| 24 * flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: | |
| 25 Removed unused field from SQL query. | |
| 26 | |
| 27 2012-10-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
| 28 | |
| 29 Finally calculate the S(Q) fractions. TODO: Split SQL into two queries. | |
| 30 | |
| 31 * src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java: | |
| 32 Make the fractions accessible. | |
| 33 | |
| 34 * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: | |
| 35 Calculate the fraction. | |
| 36 * flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/Measurements.java: | |
| 37 Store new measurements for fractions in separate list. | |
| 38 | |
| 39 2012-10-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
| 40 | |
| 41 * src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java: | |
| 42 Make it compilable again. | |
| 43 | |
| 44 2012-10-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
| 45 | |
| 46 * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java, | |
| 47 src/main/java/de/intevation/flys/artifacts/model/sq/Measurements.java: | |
| 48 Generate a second list of accumulated meassurements, | |
| 49 | |
| 50 * src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java: | |
| 51 Do not calculate the adjusted and sieve array for all measurements. | |
| 52 | |
| 53 * src/main/java/de/intevation/flys/artifacts/model/sq/Sieve.java: | |
| 54 Added diameter comparator. | |
| 55 | |
| 56 * src/main/java/de/intevation/flys/artifacts/model/sq/SieveArray.java: | |
| 57 Copy the data if total load is zero. | |
| 58 | |
| 7 | 59 |
| 8 2012-10-01 Björn Ricks <bjoern.ricks@intevation.de> | 60 2012-10-01 Björn Ricks <bjoern.ricks@intevation.de> |
| 9 | 61 |
| 10 * src/main/java/de/intevation/flys/artifacts/states/StaticState.java: | 62 * src/main/java/de/intevation/flys/artifacts/states/StaticState.java: |
| 11 Add simple default constuctor. | 63 Add simple default constuctor. |