Mercurial > dive4elements > river
annotate artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculation.java @ 9361:2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
author | mschaefer |
---|---|
date | Wed, 01 Aug 2018 18:01:11 +0200 |
parents | a978b601a034 |
children | 2da486c7c05f |
rev | line source |
---|---|
8996 | 1 /** Copyright (C) 2017 by Bundesanstalt für Gewässerkunde |
2 * Software engineering by | |
3 * Björnsen Beratende Ingenieure GmbH | |
4 * Dr. Schumacher Ingenieurbüro für Wasser und Umwelt | |
5 * | |
6 * This file is Free Software under the GNU AGPL (>=v3) | |
7 * and comes with ABSOLUTELY NO WARRANTY! Check out the | |
8 * documentation coming with Dive4Elements River for details. | |
9 */ | |
10 package org.dive4elements.river.artifacts.uinfo.salix; | |
11 | |
9309 | 12 import java.util.ArrayList; |
13 import java.util.List; | |
14 import java.util.NavigableMap; | |
15 import java.util.TreeMap; | |
8996 | 16 |
9321
a978b601a034
Salix: Fixed ArrrayoutOfBoundsException; minor cleanup
gernotbelger
parents:
9318
diff
changeset
|
17 import org.apache.commons.lang.math.DoubleRange; |
8996 | 18 import org.dive4elements.artifacts.CallContext; |
9309 | 19 import org.dive4elements.river.artifacts.access.RangeAccess; |
9361
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
20 import org.dive4elements.river.artifacts.common.GeneralResultType; |
8996 | 21 import org.dive4elements.river.artifacts.model.Calculation; |
22 import org.dive4elements.river.artifacts.model.CalculationResult; | |
23 import org.dive4elements.river.artifacts.resources.Resources; | |
9295
385b52ccde23
Work on U-Info salix line calculation and chart (no scenario case)
mschaefer
parents:
9249
diff
changeset
|
24 import org.dive4elements.river.artifacts.sinfo.common.RiverInfoProvider; |
8996 | 25 import org.dive4elements.river.artifacts.sinfo.util.CalculationUtils; |
26 import org.dive4elements.river.artifacts.sinfo.util.RiverInfo; | |
27 import org.dive4elements.river.artifacts.uinfo.UINFOArtifact; | |
9309 | 28 import org.dive4elements.river.artifacts.uinfo.salix.SalixLineAccess.ScenarioType; |
8996 | 29 import org.dive4elements.river.model.River; |
30 | |
31 /** | |
32 * @author Domenico Nardi Tironi | |
33 * | |
34 */ | |
35 final class SalixLineCalculation { | |
36 | |
37 private final CallContext context; | |
38 | |
39 public SalixLineCalculation(final CallContext context) { | |
40 this.context = context; | |
41 } | |
42 | |
43 public CalculationResult calculate(final UINFOArtifact uinfo) { | |
44 final Calculation problems = new Calculation(); | |
45 | |
46 final String calcModeLabel = Resources.getMsg(this.context.getMeta(), uinfo.getCalculationMode().name()); | |
47 final String user = CalculationUtils.findArtifactUser(this.context, uinfo); | |
48 | |
9070
611a523fc42f
VegetationZoneAccessHelper, VegetationTablePanels verbessert
gernotbelger
parents:
9069
diff
changeset
|
49 final SalixLineAccess accessSalix = new SalixLineAccess(uinfo); |
611a523fc42f
VegetationZoneAccessHelper, VegetationTablePanels verbessert
gernotbelger
parents:
9069
diff
changeset
|
50 |
611a523fc42f
VegetationZoneAccessHelper, VegetationTablePanels verbessert
gernotbelger
parents:
9069
diff
changeset
|
51 final River river = accessSalix.getRiver(); |
8996 | 52 final RiverInfo riverInfo = new RiverInfo(river); |
53 | |
9321
a978b601a034
Salix: Fixed ArrrayoutOfBoundsException; minor cleanup
gernotbelger
parents:
9318
diff
changeset
|
54 final DoubleRange range = accessSalix.getRange(); |
9068
a5cf8d7bff3c
access uinfo.salx; tablePanel edit/non-edit merge
gernotbelger
parents:
8996
diff
changeset
|
55 |
9321
a978b601a034
Salix: Fixed ArrrayoutOfBoundsException; minor cleanup
gernotbelger
parents:
9318
diff
changeset
|
56 final ScenarioType scenarioType = accessSalix.getScenario(); |
9070
611a523fc42f
VegetationZoneAccessHelper, VegetationTablePanels verbessert
gernotbelger
parents:
9069
diff
changeset
|
57 |
9321
a978b601a034
Salix: Fixed ArrrayoutOfBoundsException; minor cleanup
gernotbelger
parents:
9318
diff
changeset
|
58 final RiverInfoProvider riverInfoProvider = RiverInfoProvider.forRange(this.context, river, range); |
8996 | 59 |
9321
a978b601a034
Salix: Fixed ArrrayoutOfBoundsException; minor cleanup
gernotbelger
parents:
9318
diff
changeset
|
60 final SalixLineCalculationResults results = new SalixLineCalculationResults(calcModeLabel, user, riverInfo, range); |
a978b601a034
Salix: Fixed ArrrayoutOfBoundsException; minor cleanup
gernotbelger
parents:
9318
diff
changeset
|
61 |
a978b601a034
Salix: Fixed ArrrayoutOfBoundsException; minor cleanup
gernotbelger
parents:
9318
diff
changeset
|
62 final SalixLineCalculator calculator = new SalixLineCalculator(riverInfoProvider); |
9309 | 63 final NavigableMap<Double, List<Double>> rangeScenarios = buildRangeScenarios(accessSalix); |
64 | |
9361
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
65 calculator.execute(problems, uinfo, rangeScenarios, scenarioType, buildScenarioLabels(accessSalix), buildPartialRangeString(accessSalix), |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
66 buildAdditionalString(accessSalix), results); |
9243 | 67 |
8996 | 68 return new CalculationResult(results, problems); |
69 } | |
9243 | 70 |
9309 | 71 /** |
9361
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
72 * Build a map of delta-Ws by from-km for the selected scenario |
9309 | 73 */ |
74 private NavigableMap<Double, List<Double>> buildRangeScenarios(final SalixLineAccess access) { | |
75 final NavigableMap<Double, List<Double>> rangeScenarios = new TreeMap<>(); | |
76 if (access.getScenario() == ScenarioType.REGIONAL) | |
77 fillRangeScenarios(rangeScenarios, access, access.getFromPart().doubleValue(), access.getToPart().doubleValue(), | |
78 access.getRegionalScenarioIntegers()); | |
79 else if (access.getScenario() == ScenarioType.SUPRAREGIONAL) | |
80 fillRangeScenarios(rangeScenarios, access.getSupraRegionalString()); | |
81 // TODO else if (access.getScenario().equals(ScenarioType.HISTORICAL.getKey())) | |
82 // historisches Szenario aus MSH etc. | |
83 else | |
84 fillRangeScenarios(rangeScenarios, access); | |
9321
a978b601a034
Salix: Fixed ArrrayoutOfBoundsException; minor cleanup
gernotbelger
parents:
9318
diff
changeset
|
85 |
9309 | 86 return rangeScenarios; |
87 } | |
88 | |
89 /** | |
90 * Fill a map of delta-Ws with only one 0-delta for the whole calc range (no scenario) | |
91 */ | |
92 private void fillRangeScenarios(final NavigableMap<Double, List<Double>> rangeScenarios, final RangeAccess calcRange) { | |
93 final List<Double> nulls = new ArrayList<>(); | |
94 nulls.add(0.0); | |
95 rangeScenarios.put(Double.valueOf(calcRange.getLowerKm() - 0.0001), nulls); | |
96 } | |
97 | |
98 /** | |
99 * Fill a map of delta-Ws by km-range from the regional scenario input data | |
100 */ | |
101 private void fillRangeScenarios(final NavigableMap<Double, List<Double>> rangeScenarios, final RangeAccess calcRange, final double partFrom, | |
102 final double partTo, final int[] deltaWs) { | |
103 final List<Double> nulls = new ArrayList<>(); | |
104 final List<Double> dwsm = new ArrayList<>(); | |
105 for (int i = 0; i <= deltaWs.length - 1; i++) { | |
106 nulls.add(0.0); | |
107 dwsm.add(deltaWs[i] / 100.0); | |
108 } | |
109 rangeScenarios.put(Double.valueOf(calcRange.getLowerKm() - 0.0001), nulls); | |
110 rangeScenarios.put(Double.valueOf(partFrom - 0.0001), dwsm); | |
111 rangeScenarios.put(Double.valueOf(partTo + 0.0001), nulls); | |
112 } | |
113 | |
114 /** | |
115 * Fill a map of delta-Ws by km-range from the supraregional scenario input data | |
116 * (the zones input by the user cover the calc range completely) | |
117 */ | |
118 private void fillRangeScenarios(final NavigableMap<Double, List<Double>> rangeScenarios, final String zones) { | |
119 final List<SalixZone> parts = SalixZone.parse(zones); | |
120 for (final SalixZone part : parts) { | |
121 final List<Double> dwsm = new ArrayList<>(); | |
122 dwsm.add(part.getDwsplValue() / 100.0); | |
123 rangeScenarios.put(Double.valueOf(part.getFromKm().doubleValue() - 0.0001), dwsm); | |
124 } | |
125 } | |
126 | |
9316
72b3270e1568
U-Info salix line with regional and supraregional scenario calculation and chart display
mschaefer
parents:
9309
diff
changeset
|
127 /** |
72b3270e1568
U-Info salix line with regional and supraregional scenario calculation and chart display
mschaefer
parents:
9309
diff
changeset
|
128 * Build the list of delta-w labels for the scenario type |
72b3270e1568
U-Info salix line with regional and supraregional scenario calculation and chart display
mschaefer
parents:
9309
diff
changeset
|
129 */ |
72b3270e1568
U-Info salix line with regional and supraregional scenario calculation and chart display
mschaefer
parents:
9309
diff
changeset
|
130 private String[] buildScenarioLabels(final SalixLineAccess access) { |
72b3270e1568
U-Info salix line with regional and supraregional scenario calculation and chart display
mschaefer
parents:
9309
diff
changeset
|
131 final List<String> labels = new ArrayList<>(); |
72b3270e1568
U-Info salix line with regional and supraregional scenario calculation and chart display
mschaefer
parents:
9309
diff
changeset
|
132 if (access.getScenario() == ScenarioType.REGIONAL) { |
72b3270e1568
U-Info salix line with regional and supraregional scenario calculation and chart display
mschaefer
parents:
9309
diff
changeset
|
133 final int[] deltaws = access.getRegionalScenarioIntegers(); |
72b3270e1568
U-Info salix line with regional and supraregional scenario calculation and chart display
mschaefer
parents:
9309
diff
changeset
|
134 for (int i = 0; i <= deltaws.length - 1; i++) |
72b3270e1568
U-Info salix line with regional and supraregional scenario calculation and chart display
mschaefer
parents:
9309
diff
changeset
|
135 if (deltaws[i] != 0) |
72b3270e1568
U-Info salix line with regional and supraregional scenario calculation and chart display
mschaefer
parents:
9309
diff
changeset
|
136 labels.add(Integer.toString(deltaws[i]) + " cm"); |
9243 | 137 } |
9361
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
138 else if (access.getScenario() == ScenarioType.SUPRAREGIONAL) |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
139 labels.add(Resources.getMsg(this.context.getMeta(), "uinfo_salix_scenario_supraregional")); |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
140 else if (access.getScenario() == ScenarioType.HISTORICAL) |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
141 labels.add(Resources.getMsg(this.context.getMeta(), "uinfo_salix_scenario_historical")); |
9316
72b3270e1568
U-Info salix line with regional and supraregional scenario calculation and chart display
mschaefer
parents:
9309
diff
changeset
|
142 return labels.toArray(new String[labels.size()]); |
9243 | 143 } |
9361
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
144 |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
145 /** |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
146 * Build the km range string for the scenario type |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
147 */ |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
148 private String buildPartialRangeString(final SalixLineAccess access) { |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
149 if ((access.getScenario() == ScenarioType.REGIONAL) || (access.getScenario() == ScenarioType.HISTORICAL)) { |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
150 return String.format("%s - %s", GeneralResultType.station.exportValue(this.context, access.getFromPart().doubleValue()), |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
151 GeneralResultType.station.exportValue(this.context, access.getToPart().doubleValue())); |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
152 } |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
153 if (access.getScenario() == ScenarioType.SUPRAREGIONAL) { |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
154 String ranges = ""; |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
155 String sep = ""; |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
156 final List<SalixZone> parts = SalixZone.parse(access.getSupraRegionalString()); |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
157 for (final SalixZone part : parts) { |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
158 if (part.getDwsplValue() != 0) { |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
159 ranges = ranges + sep + String.format("%s - %s", GeneralResultType.station.exportValue(this.context, part.getFromKm().doubleValue()), |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
160 GeneralResultType.station.exportValue(this.context, part.getToKm().doubleValue())); |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
161 sep = ", "; |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
162 } |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
163 } |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
164 return ranges; |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
165 } |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
166 return ""; |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
167 } |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
168 |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
169 /** |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
170 * Build the delta w or time string for the scenario type |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
171 */ |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
172 private String buildAdditionalString(final SalixLineAccess access) { |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
173 if (access.getScenario() == ScenarioType.REGIONAL) { |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
174 String deltas = ""; |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
175 String sep = ""; |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
176 for (final int d : access.getRegionalScenarioIntegers()) { |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
177 deltas = deltas + sep + Integer.toString(d); |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
178 sep = ", "; |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
179 } |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
180 return deltas; |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
181 } |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
182 if (access.getScenario() == ScenarioType.HISTORICAL) { |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
183 if (access.getYear() != null) |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
184 return access.getYear().toString(); |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
185 else |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
186 return access.getEpoch().toString(); |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
187 } |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
188 if (access.getScenario() == ScenarioType.SUPRAREGIONAL) { |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
189 String deltas = ""; |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
190 String sep = ""; |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
191 final List<SalixZone> parts = SalixZone.parse(access.getSupraRegionalString()); |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
192 for (final SalixZone part : parts) { |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
193 if (part.getDwsplValue() != 0) { |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
194 deltas = deltas + sep + Integer.toString(part.getDwsplValue()); |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
195 sep = ", "; |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
196 } |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
197 } |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
198 return deltas; |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
199 } |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
200 return ""; |
2aec052d4088
Refactoring on SalixLineCalculationResult etc., calculation using MQ etc., scenario (regional+supra) csv columns and meta data added
mschaefer
parents:
9321
diff
changeset
|
201 } |
8996 | 202 } |