Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentDensity.java @ 6938:4c0222d94055
issue1436: Exploit validity-rule of sedimentdensities.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Wed, 28 Aug 2013 12:02:56 +0200 |
| parents | 0a3dd5be6f81 |
| children | d4108d6c4000 |
comparison
equal
deleted
inserted
replaced
| 6937:0a3dd5be6f81 | 6938:4c0222d94055 |
|---|---|
| 78 } | 78 } |
| 79 else if (this.years.size() > 1) { | 79 else if (this.years.size() > 1) { |
| 80 for (int i = 0; i < years.size() -1; i++) { | 80 for (int i = 0; i < years.size() -1; i++) { |
| 81 int y1 = years.get(i); | 81 int y1 = years.get(i); |
| 82 int y2 = years.get(i + 1); | 82 int y2 = years.get(i + 1); |
| 83 int mid = Math.round((y1 + y2) / 2); | 83 if (year >= y1 && year < y2) { |
| 84 if (year < mid) { | |
| 85 return getDensityAtKm(densities.get(y1), km); | 84 return getDensityAtKm(densities.get(y1), km); |
| 86 } | 85 } |
| 87 else if (i == years.size() -1) { | 86 else if (year >= y2 && i == years.size() -1) { |
| 88 continue; | |
| 89 } | |
| 90 else { | |
| 91 return getDensityAtKm(densities.get(y2), km); | 87 return getDensityAtKm(densities.get(y2), km); |
| 92 } | 88 } |
| 93 } | 89 } |
| 94 } | 90 } |
| 95 return 1.8d; | 91 return 1.8d; |