Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculation.java @ 9597:5395c6d4ca50
Softwaretests...20181219 7.3: no interpolation of missing bed heights for Uinfo/Salix historical scenario and B&U/Bzws
| author | mschaefer |
|---|---|
| date | Tue, 05 Feb 2019 15:47:58 +0100 |
| parents | b9c87bbff6a4 |
| children |
comparison
equal
deleted
inserted
replaced
| 9596:fbfd66e8fb81 | 9597:5395c6d4ca50 |
|---|---|
| 154 final River river = calcRange.getRiver(); | 154 final River river = calcRange.getRiver(); |
| 155 final List<BedHeight> defaultBedHeights = new DefaultBedHeights(river).getBedHeights(this.problems); | 155 final List<BedHeight> defaultBedHeights = new DefaultBedHeights(river).getBedHeights(this.problems); |
| 156 if (defaultBedHeights.isEmpty()) | 156 if (defaultBedHeights.isEmpty()) |
| 157 return; | 157 return; |
| 158 final DoubleRange scenarioRange = new DoubleRange(partFrom, partTo); | 158 final DoubleRange scenarioRange = new DoubleRange(partFrom, partTo); |
| 159 final Collection<BedHeightsFinder> allFinders = BedHeightsFinder.createTkhBedHeights(this.problems, scenarioRange, defaultBedHeights); | 159 final Collection<BedHeightsFinder> allFinders = BedHeightsFinder.createScenarioBedHeights(this.problems, scenarioRange, defaultBedHeights); |
| 160 final Collection<BedHeightsFinder> currentFinders = new ArrayList<>(allFinders); | 160 final Collection<BedHeightsFinder> currentFinders = new ArrayList<>(allFinders); |
| 161 | 161 |
| 162 // Add historical bed-heights | 162 // Add historical bed-heights |
| 163 final BedHeightsFinder historicalFinder = BedHeightsFinder.forId(this.problems, historicalBedHeightId, scenarioRange); | 163 final BedHeightsFinder historicalFinder = BedHeightsFinder.forId(this.problems, historicalBedHeightId, scenarioRange, false); |
| 164 allFinders.add(historicalFinder); | 164 allFinders.add(historicalFinder); |
| 165 final Collection<Double> stations = BedHeightsUtils.extractStationCollection(allFinders, true); | 165 final Collection<Double> stations = BedHeightsUtils.extractStationCollection(allFinders, true); |
| 166 final List<Double> nulls = new ArrayList<>(); | 166 final List<Double> nulls = new ArrayList<>(); |
| 167 nulls.add(null); | 167 nulls.add(null); |
| 168 rangeScenarios.put(Double.valueOf(calcRange.getLowerKm() - 0.0001), nulls); | 168 rangeScenarios.put(Double.valueOf(calcRange.getLowerKm() - 0.0001), nulls); |