Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculation.java @ 9495:bb278c927b66
Datenkorb bezugswasserstände längsschnitte + minor fixes
| author | gernotbelger |
|---|---|
| date | Tue, 25 Sep 2018 16:43:51 +0200 |
| parents | 7228bd10a8cc |
| children | 853f2dafc16e |
comparison
equal
deleted
inserted
replaced
| 9494:879c902c4a2d | 9495:bb278c927b66 |
|---|---|
| 84 final int endYear = access.getBezugsJahr(); | 84 final int endYear = access.getBezugsJahr(); |
| 85 final Integer ud = access.getUd(); | 85 final Integer ud = access.getUd(); |
| 86 this.missKmFrom = access.getMissingVolFrom(); | 86 this.missKmFrom = access.getMissingVolFrom(); |
| 87 this.missKmTo = access.getMissingVolTo(); | 87 this.missKmTo = access.getMissingVolTo(); |
| 88 | 88 |
| 89 final BezugswstCalculationResults results = new BezugswstCalculationResults(calcModeLabel, user, riverInfo, access.getRange()); | 89 final BezugswstCalculationResults results = new BezugswstCalculationResults(calcModeLabel, user, riverInfo, access.getRange(), |
| 90 access.isCalculateMissingVolume()); | |
| 90 | 91 |
| 91 final Calculation problems = new Calculation(); | 92 final Calculation problems = new Calculation(); |
| 92 | 93 |
| 93 // Calculate the wspl for the selected river range as in fixa awspl | 94 // Calculate the wspl for the selected river range as in fixa awspl |
| 94 bunduartifact.addStringData("wq_isq", "true"); | 95 bunduartifact.addStringData("wq_isq", "true"); |
| 115 for (int i = 0; i <= wqkms.size() - 1; i++) { | 116 for (int i = 0; i <= wqkms.size() - 1; i++) { |
| 116 this.rows.add(createRow(wqkms.getKm(i), wqkms.getW(i), wqkms.getQ(i), bedHeightsFinder, channelFinder, riverInfoProvider, wstInfo)); | 117 this.rows.add(createRow(wqkms.getKm(i), wqkms.getW(i), wqkms.getQ(i), bedHeightsFinder, channelFinder, riverInfoProvider, wstInfo)); |
| 117 } | 118 } |
| 118 | 119 |
| 119 // Compute the missing volumes | 120 // Compute the missing volumes |
| 120 if (access.isCalculateMissingValue()) { | 121 if (access.isCalculateMissingVolume()) { |
| 121 if ((bedHeightsFinder == null) || bedHeightsFinder.isNull()) | 122 if ((bedHeightsFinder == null) || bedHeightsFinder.isNull()) |
| 122 return new CalculationResult(results, problems); | 123 return new CalculationResult(results, problems); |
| 123 computeMissingVolumes(problems); | 124 computeMissingVolumes(problems); |
| 124 final BedQualityCalculator bqCalculator = computeDensities(problems, bunduartifact, access, river); | 125 final BedQualityCalculator bqCalculator = computeDensities(problems, bunduartifact, access, river); |
| 125 computeMissingMasses(problems, bqCalculator); | 126 computeMissingMasses(problems, bqCalculator); |