Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/Measurement.java @ 7709:0737573aa9ac
S/Q relation removed false COALSCE from SQL statement. Removed misplaced sieve adjustment.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Wed, 18 Dec 2013 19:51:23 +0100 |
| parents | a4cef1b17b2b |
| children | 3d772f52080a |
comparison
equal
deleted
inserted
replaced
| 7708:a4cef1b17b2b | 7709:0737573aa9ac |
|---|---|
| 189 double newFourValue = ((LOG_8_6 / SCALE_4*sixValue) + fourValue); | 189 double newFourValue = ((LOG_8_6 / SCALE_4*sixValue) + fourValue); |
| 190 | 190 |
| 191 deleteSieve(4.0); | 191 deleteSieve(4.0); |
| 192 sieves.add(new Sieve(8d, eightValue)); | 192 sieves.add(new Sieve(8d, eightValue)); |
| 193 sieves.add(new Sieve(4d, newFourValue)); | 193 sieves.add(new Sieve(4d, newFourValue)); |
| 194 /* | |
| 194 sieveArray.adjust( | 195 sieveArray.adjust( |
| 195 eightValue/sieveArray.totalLoad(), | 196 eightValue/sieveArray.totalLoad(), |
| 196 newFourValue/sieveArray.totalLoad()); | 197 newFourValue/sieveArray.totalLoad()); |
| 197 | 198 |
| 198 if (log.isDebugEnabled()) { | 199 if (log.isDebugEnabled()) { |
| 199 log.debug("Adjusted loads: " + Arrays.toString(sieveArray.getLoads())); | 200 log.debug("Adjusted loads: " + Arrays.toString(sieveArray.getLoads())); |
| 200 log.debug("Adjusted norm loads:" + Arrays.toString(sieveArray.getNormLoads())); | 201 log.debug("Adjusted norm loads:" + Arrays.toString(sieveArray.getNormLoads())); |
| 201 } | 202 } |
| 203 */ | |
| 202 } | 204 } |
| 203 | 205 |
| 204 protected SieveArray calculateSieveArray() { | 206 protected SieveArray calculateSieveArray() { |
| 205 | 207 |
| 206 SieveArray sa = new SieveArray(); | 208 SieveArray sa = new SieveArray(); |