Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedQualityCalculation.java @ 8686:9cbbaedc6cba
(issue1755) Remove redundant conditional checks.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Tue, 14 Apr 2015 17:57:09 +0200 |
| parents | fc5fcec91b73 |
| children | 5e38e2924c07 |
comparison
equal
deleted
inserted
replaced
| 8685:5b755d21c425 | 8686:9cbbaedc6cba |
|---|---|
| 90 | 90 |
| 91 /** Adds non empty values to a result and adds Problems for empty ones.*/ | 91 /** Adds non empty values to a result and adds Problems for empty ones.*/ |
| 92 protected void addValuesToResult(BedQualityResult result, | 92 protected void addValuesToResult(BedQualityResult result, |
| 93 BedQualityResultValue[] values) { | 93 BedQualityResultValue[] values) { |
| 94 for (BedQualityResultValue value: values) { | 94 for (BedQualityResultValue value: values) { |
| 95 if (value.isEmpty() || value.isNaN() || !value.isInterpolateable()) { | 95 if (!value.isInterpolateable()) { |
| 96 if (value.isDiameterResult()) { | 96 if (value.isDiameterResult()) { |
| 97 addProblem("bedquality.missing.diameter." + | 97 addProblem("bedquality.missing.diameter." + |
| 98 value.getType(), value.getName().toUpperCase(), | 98 value.getType(), value.getName().toUpperCase(), |
| 99 result.getDateRange().getFrom(), | 99 result.getDateRange().getFrom(), |
| 100 result.getDateRange().getTo()); | 100 result.getDateRange().getTo()); |
| 101 } else { | 101 } else { |
| 102 addProblem("bedquality.missing." + value.getName() + "." + | 102 addProblem("bedquality.missing." + value.getName() + "." + |
| 103 value.getType(), result.getDateRange().getFrom(), | 103 value.getType(), result.getDateRange().getFrom(), |
| 104 result.getDateRange().getTo()); | 104 result.getDateRange().getTo()); |
| 105 } | 105 } |
| 106 if (!value.isInterpolateable() && (!value.isEmpty() && !value.isNaN())) { | 106 if (!value.isEmpty() && !value.isNaN()) { |
| 107 // we want to keep single point results | 107 // we want to keep single point results |
| 108 result.add(value); | 108 result.add(value); |
| 109 } | 109 } |
| 110 } else { | 110 } else { |
| 111 result.add(value); | 111 result.add(value); |