Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java @ 8422:96bf5135cd0e
Bedheight differences exports sounding width and data gap for minuend and subtrahend.
author | Raimund Renkert <rrenkert@intevation.de> |
---|---|
date | Fri, 17 Oct 2014 13:34:08 +0200 |
parents | 8a14605fb64a |
children | 706668b19b04 |
comparison
equal
deleted
inserted
replaced
8421:0fa963038c61 | 8422:96bf5135cd0e |
---|---|
67 BedHeightSingleData s2 = pair[1]; | 67 BedHeightSingleData s2 = pair[1]; |
68 | 68 |
69 TDoubleArrayList stations = s1.getStations(); | 69 TDoubleArrayList stations = s1.getStations(); |
70 int size = stations.size(); | 70 int size = stations.size(); |
71 | 71 |
72 TDoubleArrayList diffRes = new TDoubleArrayList(size); | 72 TDoubleArrayList diffRes = new TDoubleArrayList(size); |
73 TDoubleArrayList kms = new TDoubleArrayList(size); | 73 TDoubleArrayList kms = new TDoubleArrayList(size); |
74 TDoubleArrayList soundings = new TDoubleArrayList(size); | 74 TDoubleArrayList soundings1 = new TDoubleArrayList(size); |
75 TDoubleArrayList absolute = new TDoubleArrayList(size); | 75 TDoubleArrayList soundings2 = new TDoubleArrayList(size); |
76 TDoubleArrayList gap = new TDoubleArrayList(size); | 76 TDoubleArrayList absolute = new TDoubleArrayList(size); |
77 TDoubleArrayList heights1 = new TDoubleArrayList(size); | 77 TDoubleArrayList gap1 = new TDoubleArrayList(size); |
78 TDoubleArrayList heights2 = new TDoubleArrayList(size); | 78 TDoubleArrayList gap2 = new TDoubleArrayList(size); |
79 TDoubleArrayList heights1 = new TDoubleArrayList(size); | |
80 TDoubleArrayList heights2 = new TDoubleArrayList(size); | |
79 //TDoubleArrayList morphs1 = new TDoubleArrayList(size); | 81 //TDoubleArrayList morphs1 = new TDoubleArrayList(size); |
80 //TDoubleArrayList morphs2 = new TDoubleArrayList(size); | 82 //TDoubleArrayList morphs2 = new TDoubleArrayList(size); |
81 | 83 |
82 Integer range = null; | 84 Integer range = null; |
83 if (s1.getYear() != null && s2.getYear() != null) { | 85 if (s1.getYear() != null && s2.getYear() != null) { |
94 | 96 |
95 if (!Double.isNaN(hDiff)) { | 97 if (!Double.isNaN(hDiff)) { |
96 diffRes.add(hDiff); | 98 diffRes.add(hDiff); |
97 kms.add(station); | 99 kms.add(station); |
98 | 100 |
99 soundings.add(Math.max( | 101 soundings1.add(s1.getSoundingWidth(station)); |
100 s1.getSoundingWidth(station), | 102 soundings2.add(s2.getSoundingWidth(station)); |
101 s2.getSoundingWidth(station))); | |
102 | 103 |
103 gap.add(Math.max( | 104 gap1.add(s1.getDataGap(station)); |
104 s1.getDataGap(station), | 105 gap2.add(s2.getDataGap(station)); |
105 s2.getDataGap(station))); | |
106 | 106 |
107 if (range != null) { | 107 if (range != null) { |
108 absolute.add((hDiff / range) * 100d); | 108 absolute.add((hDiff / range) * 100d); |
109 } | 109 } |
110 heights1.add(h1); | 110 heights1.add(h1); |
118 diffRes, | 118 diffRes, |
119 heights1, | 119 heights1, |
120 heights2, | 120 heights2, |
121 //morphs1, | 121 //morphs1, |
122 //morphs2, | 122 //morphs2, |
123 soundings, | 123 soundings1, |
124 soundings2, | |
124 absolute, | 125 absolute, |
125 gap, | 126 gap1, |
127 gap2, | |
126 s1.getYear(), | 128 s1.getYear(), |
127 s2.getYear(), | 129 s2.getYear(), |
128 s1.getName(), | 130 s1.getName(), |
129 s2.getName(), | 131 s2.getName(), |
130 ids[0], | 132 ids[0], |