Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java @ 7828:8faa8cfd2385 minfo-opt
Renamed the incorrectly named morph width to sounding width.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Thu, 27 Mar 2014 14:56:34 +0100 |
| parents | 04b70a6fe8c5 |
| children | 1aba75321441 |
comparison
equal
deleted
inserted
replaced
| 7826:982382d9ea8b | 7828:8faa8cfd2385 |
|---|---|
| 131 BedHeightSingleData s2 = (BedHeightSingleData) pair[1]; | 131 BedHeightSingleData s2 = (BedHeightSingleData) pair[1]; |
| 132 | 132 |
| 133 TDoubleArrayList stations = s1.getStations(); | 133 TDoubleArrayList stations = s1.getStations(); |
| 134 int size = stations.size(); | 134 int size = stations.size(); |
| 135 | 135 |
| 136 TDoubleArrayList diffRes = new TDoubleArrayList(size); | 136 TDoubleArrayList diffRes = new TDoubleArrayList(size); |
| 137 TDoubleArrayList kms = new TDoubleArrayList(size); | 137 TDoubleArrayList kms = new TDoubleArrayList(size); |
| 138 TDoubleArrayList morphs = new TDoubleArrayList(size); | 138 TDoubleArrayList soundings = new TDoubleArrayList(size); |
| 139 TDoubleArrayList absolute = new TDoubleArrayList(size); | 139 TDoubleArrayList absolute = new TDoubleArrayList(size); |
| 140 TDoubleArrayList gap = new TDoubleArrayList(size); | 140 TDoubleArrayList gap = new TDoubleArrayList(size); |
| 141 TDoubleArrayList heights1 = new TDoubleArrayList(size); | 141 TDoubleArrayList heights1 = new TDoubleArrayList(size); |
| 142 TDoubleArrayList heights2 = new TDoubleArrayList(size); | 142 TDoubleArrayList heights2 = new TDoubleArrayList(size); |
| 143 | 143 |
| 144 int range = Math.abs(s1.getYear() - s2.getYear()); | 144 int range = Math.abs(s1.getYear() - s2.getYear()); |
| 145 | 145 |
| 146 for (int i = 0; i < size; i++) { | 146 for (int i = 0; i < size; i++) { |
| 147 double station = stations.getQuick(i); | 147 double station = stations.getQuick(i); |
| 151 | 151 |
| 152 if (!Double.isNaN(hDiff)) { | 152 if (!Double.isNaN(hDiff)) { |
| 153 diffRes.add(hDiff); | 153 diffRes.add(hDiff); |
| 154 kms.add(station); | 154 kms.add(station); |
| 155 | 155 |
| 156 morphs.add(Math.max( | 156 soundings.add(Math.max( |
| 157 s1.getMorphWidth(station), | 157 s1.getSoundingWidth(station), |
| 158 s2.getMorphWidth(station))); | 158 s2.getSoundingWidth(station))); |
| 159 | 159 |
| 160 gap.add(Math.max( | 160 gap.add(Math.max( |
| 161 s1.getDataGap(station), | 161 s1.getDataGap(station), |
| 162 s2.getDataGap(station))); | 162 s2.getDataGap(station))); |
| 163 | 163 |
| 169 return new BedDiffYearResult( | 169 return new BedDiffYearResult( |
| 170 kms, | 170 kms, |
| 171 diffRes, | 171 diffRes, |
| 172 heights1, | 172 heights1, |
| 173 heights2, | 173 heights2, |
| 174 morphs, | 174 soundings, |
| 175 absolute, | 175 absolute, |
| 176 gap, | 176 gap, |
| 177 s1.getYear(), | 177 s1.getYear(), |
| 178 s2.getYear(), | 178 s2.getYear(), |
| 179 s1.getName(), | 179 s1.getName(), |