Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/Measurement.java @ 7708:a4cef1b17b2b
S/Q relation: Adjust sieves only once during construction.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Wed, 18 Dec 2013 15:37:53 +0100 |
| parents | a877d2680a4a |
| children | 0737573aa9ac |
comparison
equal
deleted
inserted
replaced
| 7707:cead6df5b7b3 | 7708:a4cef1b17b2b |
|---|---|
| 36 } | 36 } |
| 37 | 37 |
| 38 public Measurement(Map<String, Object> data, List<Sieve> sieves) { | 38 public Measurement(Map<String, Object> data, List<Sieve> sieves) { |
| 39 this.data = data; | 39 this.data = data; |
| 40 this.sieves = sieves; | 40 this.sieves = sieves; |
| 41 if (sieves != null && !sieves.isEmpty()) { | |
| 42 adjustSieves(); | |
| 43 } | |
| 41 } | 44 } |
| 42 | 45 |
| 43 protected double get(String name) { | 46 protected double get(String name) { |
| 44 Number value = (Number)data.get(name); | 47 Number value = (Number)data.get(name); |
| 45 return value != null ? value.doubleValue() : Double.NaN; | 48 return value != null ? value.doubleValue() : Double.NaN; |
| 130 */ | 133 */ |
| 131 public SieveArray getSieveArray() { | 134 public SieveArray getSieveArray() { |
| 132 if (sieveArray == null) { | 135 if (sieveArray == null) { |
| 133 sieveArray = calculateSieveArray(); | 136 sieveArray = calculateSieveArray(); |
| 134 } | 137 } |
| 135 adjustSieves(); | 138 // XXX: @rrenkert: Why did you place the adjument here? |
| 139 // adjustSieves(); | |
| 136 return sieveArray; | 140 return sieveArray; |
| 137 } | 141 } |
| 138 | 142 |
| 139 protected Sieve findSieve(double diameter) { | 143 protected Sieve findSieve(double diameter) { |
| 140 for (Sieve s: sieves) { | 144 for (Sieve s: sieves) { |