Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculationResult.java @ 9504:76c0665888a3
No rounding during calculation (Meilenstein-2 2.4.2 and 2.9), delta-w-cm as double (for historical scenario)
author | mschaefer |
---|---|
date | Fri, 28 Sep 2018 10:13:09 +0200 |
parents | 853f2dafc16e |
children | 267ac3012150 |
comparison
equal
deleted
inserted
replaced
9503:83e6acdf8fc6 | 9504:76c0665888a3 |
---|---|
129 lines.add(context.formatRowValue(row, UInfoResultType.salixline)); | 129 lines.add(context.formatRowValue(row, UInfoResultType.salixline)); |
130 lines.add(context.formatRowValue(row, UInfoResultType.salix_mw_mnw)); | 130 lines.add(context.formatRowValue(row, UInfoResultType.salix_mw_mnw)); |
131 | 131 |
132 if (context instanceof ExportContextCSV) { | 132 if (context instanceof ExportContextCSV) { |
133 final NumberFormat formatter = ((AbstractExportContext) context).getSalixScenFormatter(); | 133 final NumberFormat formatter = ((AbstractExportContext) context).getSalixScenFormatter(); |
134 final NumberFormat intFormatter = ((AbstractExportContext) context).getIntegerFormatter(); | |
134 final List<SalixScenario> scenarios = (List<SalixScenario>) row.getValue(UInfoResultType.customMultiRowColSalixScenarios); | 135 final List<SalixScenario> scenarios = (List<SalixScenario>) row.getValue(UInfoResultType.customMultiRowColSalixScenarios); |
135 for (int i = 1; i <= this.getScenarioCount(); i++) { | 136 for (int i = 1; i <= this.getScenarioCount(); i++) { |
136 if (i > scenarios.size()) | 137 if (i > scenarios.size()) |
137 break; | 138 break; |
138 if (scenarios.get(i - 1) != null) { | 139 if (scenarios.get(i - 1) != null) { |
139 lines.add(scenarios.get(i - 1).getDeltaWFormatted()); | 140 lines.add(scenarios.get(i - 1).getDeltaWFormatted(intFormatter)); |
140 lines.add(scenarios.get(i - 1).getSalixValueFormatted(formatter)); | 141 lines.add(scenarios.get(i - 1).getSalixValueFormatted(formatter)); |
141 } else { | 142 } else { |
142 lines.add(""); | 143 lines.add(""); |
143 lines.add(""); | 144 lines.add(""); |
144 } | 145 } |