Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityCalculation.java @ 3785:a5f65e8983be
Merged revisions 5501-5502,5504-5508,5511-5513,5516-5519 via svnmerge from
file:///home/clients/bsh/bsh-generischer-viewer/Material/SVN/flys-artifacts/trunk
........
r5501 | felix | 2012-09-18 11:49:45 +0200 (Di, 18 Sep 2012) | 1 line
fix issue865 - missing showarea theme prop.
........
r5502 | clins | 2012-09-18 12:18:30 +0200 (Di, 18 Sep 2012) | 1 line
Add robustness checks to prevent NPEs
........
r5504 | felix | 2012-09-18 14:03:15 +0200 (Di, 18 Sep 2012) | 1 line
i18n for area label (fix issue487).
........
r5505 | clins | 2012-09-18 16:19:59 +0200 (Di, 18 Sep 2012) | 1 line
Update themes to show point descriptions
........
r5506 | rrenkert | 2012-09-18 17:00:30 +0200 (Di, 18 Sep 2012) | 3 lines
Removed incorrect characteristic diameter.
........
r5507 | rrenkert | 2012-09-18 17:03:20 +0200 (Di, 18 Sep 2012) | 3 lines
Fixed some stupid bugs in bed quality data factory and calculation.
........
r5508 | teichmann | 2012-09-18 17:45:49 +0200 (Di, 18 Sep 2012) | 1 line
The usual whitespace and import cleanups.
........
r5511 | teichmann | 2012-09-18 18:24:51 +0200 (Di, 18 Sep 2012) | 1 line
Use generics aware Collections.emptyList().
........
r5512 | teichmann | 2012-09-18 20:36:52 +0200 (Di, 18 Sep 2012) | 1 line
Some more little steps towards "Auslagerung extremer Wasserspiegellagen".
........
r5513 | clins | 2012-09-18 23:38:19 +0200 (Di, 18 Sep 2012) | 1 line
A and B facets of fix analyis are now deactivated by default
........
r5516 | bricks | 2012-09-19 10:45:51 +0200 (Mi, 19 Sep 2012) | 2 lines
Add the gauge station to the GaugeOverviewInfoService xml response
........
r5517 | rrenkert | 2012-09-19 10:50:23 +0200 (Mi, 19 Sep 2012) | 3 lines
Added CSV export to bed quality calculation.
........
r5518 | bricks | 2012-09-19 11:04:04 +0200 (Mi, 19 Sep 2012) | 2 lines
Fix date in changelog entry
........
r5519 | teichmann | 2012-09-19 11:17:14 +0200 (Mi, 19 Sep 2012) | 1 line
Removed trailing whitespace.
........
flys-artifacts/tags/2.9.1@5531 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Wed, 19 Sep 2012 14:58:31 +0000 |
parents | 9f9d5ada96ca |
children | 22cd60315e08 |
comparison
equal
deleted
inserted
replaced
3784:9f9d5ada96ca | 3785:a5f65e8983be |
---|---|
84 | 84 |
85 List<BedQualityResult> results = new LinkedList<BedQualityResult>(); | 85 List<BedQualityResult> results = new LinkedList<BedQualityResult>(); |
86 // Calculate for all time periods. | 86 // Calculate for all time periods. |
87 for (DateRange dr : ranges) { | 87 for (DateRange dr : ranges) { |
88 QualityMeasurements loadMeasurements = | 88 QualityMeasurements loadMeasurements = |
89 QualityMeasurementFactory.getBedMeasurements( | 89 QualityMeasurementFactory.getBedloadMeasurements( |
90 river, | 90 river, |
91 from, | 91 from, |
92 to, | 92 to, |
93 dr.getFrom(), | 93 dr.getFrom(), |
94 dr.getTo()); | 94 dr.getTo()); |
137 TDoubleArrayList location = new TDoubleArrayList(); | 137 TDoubleArrayList location = new TDoubleArrayList(); |
138 TDoubleArrayList porosityCap = new TDoubleArrayList(); | 138 TDoubleArrayList porosityCap = new TDoubleArrayList(); |
139 TDoubleArrayList porositySub = new TDoubleArrayList(); | 139 TDoubleArrayList porositySub = new TDoubleArrayList(); |
140 TDoubleArrayList densityCap = new TDoubleArrayList(); | 140 TDoubleArrayList densityCap = new TDoubleArrayList(); |
141 TDoubleArrayList densitySub = new TDoubleArrayList(); | 141 TDoubleArrayList densitySub = new TDoubleArrayList(); |
142 | 142 |
143 for(double km : kms) { | 143 for(double km : kms) { |
144 double[] pCap = calculatePorosity(capFiltered, km); | 144 double[] pCap = calculatePorosity(capFiltered, km); |
145 double[] pSub = calculatePorosity(subFiltered, km); | 145 double[] pSub = calculatePorosity(subFiltered, km); |
146 double[] dCap = calculateDensity(capFiltered, pCap); | 146 double[] dCap = calculateDensity(capFiltered, pCap); |
147 double[] dSub = calculateDensity(subFiltered, pSub); | 147 double[] dSub = calculateDensity(subFiltered, pSub); |
161 location.add(km); | 161 location.add(km); |
162 porosityCap.add((pCapRes / pCap.length) * 100 ); | 162 porosityCap.add((pCapRes / pCap.length) * 100 ); |
163 porositySub.add((pSubRes / pSub.length) * 100); | 163 porositySub.add((pSubRes / pSub.length) * 100); |
164 densityCap.add((dCapRes / dCap.length) / 1000); | 164 densityCap.add((dCapRes / dCap.length) / 1000); |
165 densitySub.add((dSubRes / dSub.length) / 1000); | 165 densitySub.add((dSubRes / dSub.length) / 1000); |
166 | 166 |
167 } | 167 } |
168 | 168 |
169 return new BedParametersResult( | 169 return new BedParametersResult( |
170 location, | 170 location, |
171 porosityCap, | 171 porosityCap, |