Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentDensity.java @ 6948:d4108d6c4000
Cosmetics, docs.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Fri, 30 Aug 2013 09:47:15 +0200 |
| parents | 4c0222d94055 |
| children | 13c2762270a6 |
comparison
equal
deleted
inserted
replaced
| 6947:51f28e5417ee | 6948:d4108d6c4000 |
|---|---|
| 133 double b = lowerDensity - | 133 double b = lowerDensity - |
| 134 ((upperDensity - lowerDensity)/(upper - lower) * lower); | 134 ((upperDensity - lowerDensity)/(upper - lower) * lower); |
| 135 return (m * km) + b; | 135 return (m * km) + b; |
| 136 } | 136 } |
| 137 | 137 |
| 138 | |
| 139 /** If multiple values for same year and station are found, | |
| 140 * build and store average, dismiss multiple values. */ | |
| 138 public void cleanUp() { | 141 public void cleanUp() { |
| 139 Set<Integer> keys = densities.keySet(); | 142 Set<Integer> keys = densities.keySet(); |
| 143 // Walk over years | |
| 140 for (Integer key : keys) { | 144 for (Integer key : keys) { |
| 141 List<SedimentDensityValue> list = densities.get(key); | 145 List<SedimentDensityValue> list = densities.get(key); |
| 142 if (list.size() == 0) { | 146 if (list.size() == 0) { |
| 143 return; | 147 return; |
| 144 } | 148 } |
| 146 new ArrayList<SedimentDensityValue>(); | 150 new ArrayList<SedimentDensityValue>(); |
| 147 double prevkm = list.get(0).getKm(); | 151 double prevkm = list.get(0).getKm(); |
| 148 int counter = 0; | 152 int counter = 0; |
| 149 double sum = 0d; | 153 double sum = 0d; |
| 150 for (SedimentDensityValue value : list) { | 154 for (SedimentDensityValue value : list) { |
| 155 // Apparently we can assume that values are ordered by km. | |
| 151 if (value.getKm() == prevkm) { | 156 if (value.getKm() == prevkm) { |
| 152 sum += value.getDensity(); | 157 sum += value.getDensity(); |
| 153 counter++; | 158 counter++; |
| 154 } | 159 } |
| 155 else { | 160 else { |
| 164 } | 169 } |
| 165 this.densities.put(key, cleaned); | 170 this.densities.put(key, cleaned); |
| 166 } | 171 } |
| 167 } | 172 } |
| 168 } | 173 } |
| 174 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : |