Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/exports/WaterlevelExporter.java @ 9638:6c1ebf2220f5
# 19b (check for usages of WaterlevelExporter.getWforGaugeAndQ) -> cleanup: removing calc.extreme.curve
| author | dnt_bjoernsen <d.tironi@bjoernsen.de> |
|---|---|
| date | Thu, 31 Oct 2019 17:37:53 +0100 |
| parents | 2b1626fa4a95 |
| children |
comparison
equal
deleted
inserted
replaced
| 9635:a03c54129819 | 9638:6c1ebf2220f5 |
|---|---|
| 1117 private Double getWforGaugeAndQ(final Gauge gauge, final double q) { | 1117 private Double getWforGaugeAndQ(final Gauge gauge, final double q) { |
| 1118 | 1118 |
| 1119 final String key = gauge != null ? gauge.getName() + String.valueOf(q) : null; | 1119 final String key = gauge != null ? gauge.getName() + String.valueOf(q) : null; |
| 1120 if (!this.gaugeQ_W_Map.containsKey(key) && key != null) { | 1120 if (!this.gaugeQ_W_Map.containsKey(key) && key != null) { |
| 1121 | 1121 |
| 1122 final DischargeTable dt = gauge.fetchMasterDischargeTable(); | 1122 // (Pos 19.1 b) |
| 1123 final DischargeTable dt = gauge.fetchRecentDischargeTable(); | |
| 1123 final double[][] table = DischargeTables.loadDischargeTableValues(dt); | 1124 final double[][] table = DischargeTables.loadDischargeTableValues(dt); |
| 1124 | 1125 |
| 1125 final double[] qs = DischargeTables.getWsForQ(table, q); | 1126 final double[] qs = DischargeTables.getWsForQ(table, q); |
| 1126 | 1127 |
| 1127 // final DischargeTables dct = new DischargeTables(gauge.getRiver().getName(), gauge.getName()); | |
| 1128 // final double[] qs = DischargeTables.getWsForQ(dct.getFirstTable(), q); // TODO: KLÄREN, welche Abflusstabelle | |
| 1129 // genommen werden soll! | |
| 1130 if (qs != null && qs.length > 0) { | 1128 if (qs != null && qs.length > 0) { |
| 1131 this.gaugeQ_W_Map.put(key, qs[0]); | 1129 this.gaugeQ_W_Map.put(key, qs[0]); |
| 1132 } | 1130 } |
| 1133 } | 1131 } |
| 1134 return this.gaugeQ_W_Map.get(key); | 1132 return this.gaugeQ_W_Map.get(key); |