# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller@intevation.de>
# Date 1349163259 -7200
# Node ID 9743bf17fce3556028908dc8ede6dfd388e053ce
# Parent  bf687419feba3dd80598bc6bdfba3d3cb56282a1
Reverted merge-victims in ChangeLog.

diff -r bf687419feba -r 9743bf17fce3 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Tue Oct 02 09:25:41 2012 +0200
+++ b/flys-artifacts/ChangeLog	Tue Oct 02 09:34:19 2012 +0200
@@ -5,6 +5,58 @@
 	  flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/LocationProvider.java:
 	  Added TODOs for issue880.
 
+2012-10-01	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java:
+	  Totals are now fetched with separate SQL statement. Fixed join to
+	  GEWAESSER table.
+
+2012-10-01	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java:
+	  Wrote fractions SQL more compact. Fixed AIOOBE.
+
+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.
+
+	* src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java:
+	  Make the fractions accessible.
+
+	* src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java:
+	  Calculate the fraction.
+	* flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/Measurements.java:
+	  Store new measurements for fractions in separate list.
+
+2012-10-01	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java:
+	  Make it compilable again.
+
+2012-10-01	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java,
+	  src/main/java/de/intevation/flys/artifacts/model/sq/Measurements.java:
+	  Generate a second list of accumulated meassurements,
+
+	* src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java:
+	  Do not calculate the adjusted and sieve array for all measurements.
+
+	* src/main/java/de/intevation/flys/artifacts/model/sq/Sieve.java:
+	  Added diameter comparator.
+
+	* src/main/java/de/intevation/flys/artifacts/model/sq/SieveArray.java:
+	  Copy the data if total load is zero.
+
+
 2012-10-01	Björn Ricks	<bjoern.ricks@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/states/StaticState.java: