Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedQualityCalculation.java @ 8856:5e38e2924c07 3.2.x
Fix code style.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Thu, 18 Jan 2018 20:12:01 +0100 |
| parents | 9cbbaedc6cba |
| children | 0a5239a1e46e |
comparison
equal
deleted
inserted
replaced
| 8855:d7c005e12af0 | 8856:5e38e2924c07 |
|---|---|
| 135 dr.getTo()); | 135 dr.getTo()); |
| 136 BedQualityResult result = new BedQualityResult(); | 136 BedQualityResult result = new BedQualityResult(); |
| 137 result.setDateRange(dr); | 137 result.setDateRange(dr); |
| 138 if (!bedDiameter.isEmpty()) { | 138 if (!bedDiameter.isEmpty()) { |
| 139 log.debug("Bed diameter is not empty + " + bedDiameter); | 139 log.debug("Bed diameter is not empty + " + bedDiameter); |
| 140 addValuesToResult(result, calculateBedParameter(bedMeasurements)); | 140 addValuesToResult( |
| 141 result, calculateBedParameter(bedMeasurements)); | |
| 141 for (String bd : bedDiameter) { | 142 for (String bd : bedDiameter) { |
| 142 addValuesToResult(result, calculateBed(bedMeasurements, bd)); | 143 addValuesToResult( |
| 144 result, calculateBed(bedMeasurements, bd)); | |
| 143 } | 145 } |
| 144 } | 146 } |
| 145 if (!bedloadDiameter.isEmpty()) { | 147 if (!bedloadDiameter.isEmpty()) { |
| 146 for (String bld : bedloadDiameter) { | 148 for (String bld : bedloadDiameter) { |
| 147 addValuesToResult(result, calculateBedload(loadMeasurements, bld)); | 149 addValuesToResult( |
| 150 result, calculateBedload(loadMeasurements, bld)); | |
| 148 } | 151 } |
| 149 } | 152 } |
| 150 results.add(result); | 153 results.add(result); |
| 151 } | 154 } |
| 152 | 155 |
| 191 densitySub.add((dSubRes / dSub.length) / 1000); | 194 densitySub.add((dSubRes / dSub.length) / 1000); |
| 192 | 195 |
| 193 } | 196 } |
| 194 return new BedQualityResultValue[] { | 197 return new BedQualityResultValue[] { |
| 195 new BedQualityResultValue("porosity", | 198 new BedQualityResultValue("porosity", |
| 196 new double[][] {location.toNativeArray(), porositySub.toNativeArray()}, | 199 new double[][] {location.toNativeArray(), |
| 200 porositySub.toNativeArray()}, | |
| 197 "sublayer"), | 201 "sublayer"), |
| 198 new BedQualityResultValue("porosity", | 202 new BedQualityResultValue("porosity", |
| 199 new double[][] {location.toNativeArray(), porosityCap.toNativeArray()}, | 203 new double[][] {location.toNativeArray(), |
| 204 porosityCap.toNativeArray()}, | |
| 200 "toplayer"), | 205 "toplayer"), |
| 201 new BedQualityResultValue("density", | 206 new BedQualityResultValue("density", |
| 202 new double[][] {location.toNativeArray(), densitySub.toNativeArray()}, | 207 new double[][] {location.toNativeArray(), |
| 208 densitySub.toNativeArray()}, | |
| 203 "sublayer"), | 209 "sublayer"), |
| 204 new BedQualityResultValue("density", | 210 new BedQualityResultValue("density", |
| 205 new double[][] {location.toNativeArray(), densityCap.toNativeArray()}, | 211 new double[][] {location.toNativeArray(), |
| 212 densityCap.toNativeArray()}, | |
| 206 "toplayer")}; | 213 "toplayer")}; |
| 207 } | 214 } |
| 208 | 215 |
| 209 protected BedQualityResultValue[] calculateBed( | 216 protected BedQualityResultValue[] calculateBed( |
| 210 QualityMeasurements qm, | 217 QualityMeasurements qm, |
| 228 avDiameterCap.add(avCap * 1000);// bring to mm. | 235 avDiameterCap.add(avCap * 1000);// bring to mm. |
| 229 avDiameterSub.add(avSub * 1000); | 236 avDiameterSub.add(avSub * 1000); |
| 230 } | 237 } |
| 231 return new BedQualityResultValue[] { | 238 return new BedQualityResultValue[] { |
| 232 new BedQualityResultValue(diameter, | 239 new BedQualityResultValue(diameter, |
| 233 new double[][] {location.toNativeArray(), avDiameterSub.toNativeArray()}, | 240 new double[][] {location.toNativeArray(), |
| 241 avDiameterSub.toNativeArray()}, | |
| 234 "sublayer"), | 242 "sublayer"), |
| 235 new BedQualityResultValue(diameter, | 243 new BedQualityResultValue(diameter, |
| 236 new double[][] {location.toNativeArray(), avDiameterCap.toNativeArray()}, | 244 new double[][] {location.toNativeArray(), |
| 245 avDiameterCap.toNativeArray()}, | |
| 237 "toplayer")}; | 246 "toplayer")}; |
| 238 } | 247 } |
| 239 | 248 |
| 240 private double[] calculateDensity( | 249 private double[] calculateDensity( |
| 241 QualityMeasurements capFiltered, | 250 QualityMeasurements capFiltered, |
| 279 location.add(km); | 288 location.add(km); |
| 280 avDiameter.add(mid * 1000); | 289 avDiameter.add(mid * 1000); |
| 281 } | 290 } |
| 282 return new BedQualityResultValue[] { | 291 return new BedQualityResultValue[] { |
| 283 new BedQualityResultValue(diameter, | 292 new BedQualityResultValue(diameter, |
| 284 new double[][] {location.toNativeArray(), avDiameter.toNativeArray()}, | 293 new double[][] {location.toNativeArray(), |
| 294 avDiameter.toNativeArray()}, | |
| 285 "bedload")}; | 295 "bedload")}; |
| 286 } | 296 } |
| 287 | 297 |
| 288 protected double calculateAverage( | 298 protected double calculateAverage( |
| 289 List<QualityMeasurement> list, | 299 List<QualityMeasurement> list, |