Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffYearResult.java @ 8422:96bf5135cd0e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
14 /** Result of a bed diff year calculation. */ 14 /** Result of a bed diff year calculation. */
15 public class BedDiffYearResult 15 public class BedDiffYearResult
16 extends BedDifferencesResult 16 extends BedDifferencesResult
17 { 17 {
18 protected TDoubleArrayList diffsPerYear; 18 protected TDoubleArrayList diffsPerYear;
19 protected TDoubleArrayList dataGap; 19 protected TDoubleArrayList dataGap1;
20 protected TDoubleArrayList soundingWidth; 20 protected TDoubleArrayList dataGap2;
21 protected TDoubleArrayList soundingWidth1;
22 protected TDoubleArrayList soundingWidth2;
21 //protected TDoubleArrayList morphWidth1; 23 //protected TDoubleArrayList morphWidth1;
22 //protected TDoubleArrayList morphWidth2; 24 //protected TDoubleArrayList morphWidth2;
23 protected Integer start; 25 protected Integer start;
24 protected Integer end; 26 protected Integer end;
25 protected String nameFirst; 27 protected String nameFirst;
28 protected int idSecond; 30 protected int idSecond;
29 31
30 public BedDiffYearResult () { 32 public BedDiffYearResult () {
31 super(); 33 super();
32 this.diffsPerYear = new TDoubleArrayList(); 34 this.diffsPerYear = new TDoubleArrayList();
33 this.dataGap = new TDoubleArrayList(); 35 this.dataGap1 = new TDoubleArrayList();
34 this.soundingWidth = new TDoubleArrayList(); 36 this.dataGap2 = new TDoubleArrayList();
37 this.soundingWidth1 = new TDoubleArrayList();
38 this.soundingWidth2 = new TDoubleArrayList();
35 //this.morphWidth1 = new TDoubleArrayList(); 39 //this.morphWidth1 = new TDoubleArrayList();
36 //this.morphWidth2 = new TDoubleArrayList(); 40 //this.morphWidth2 = new TDoubleArrayList();
37 } 41 }
38 42
39 /** 43 /**
48 TDoubleArrayList differences, 52 TDoubleArrayList differences,
49 TDoubleArrayList heights1, 53 TDoubleArrayList heights1,
50 TDoubleArrayList heights2, 54 TDoubleArrayList heights2,
51 //TDoubleArrayList morphWidth1, 55 //TDoubleArrayList morphWidth1,
52 //TDoubleArrayList morphWidth2, 56 //TDoubleArrayList morphWidth2,
53 TDoubleArrayList soundingWidth, 57 TDoubleArrayList soundingWidth1,
58 TDoubleArrayList soundingWidth2,
54 TDoubleArrayList diffsPerYear, 59 TDoubleArrayList diffsPerYear,
55 TDoubleArrayList dataGap, 60 TDoubleArrayList dataGap1,
61 TDoubleArrayList dataGap2,
56 Integer start, 62 Integer start,
57 Integer end, 63 Integer end,
58 String nameFirst, 64 String nameFirst,
59 String nameSecond, 65 String nameSecond,
60 int idFirst, 66 int idFirst,
61 int idSecond 67 int idSecond
62 ) { 68 ) {
63 super(kms, differences, heights1, heights2); 69 super(kms, differences, heights1, heights2);
64 this.diffsPerYear = diffsPerYear; 70 this.diffsPerYear = diffsPerYear;
65 this.dataGap = dataGap; 71 this.dataGap1 = dataGap1;
66 this.soundingWidth = soundingWidth; 72 this.dataGap2 = dataGap2;
73 this.soundingWidth1 = soundingWidth1;
74 this.soundingWidth2 = soundingWidth2;
67 //this.morphWidth1 = morphWidth1; 75 //this.morphWidth1 = morphWidth1;
68 //this.morphWidth2 = morphWidth2; 76 //this.morphWidth2 = morphWidth2;
69 this.start = start; 77 this.start = start;
70 this.end = end; 78 this.end = end;
71 this.nameFirst = nameFirst; 79 this.nameFirst = nameFirst;
76 84
77 public TDoubleArrayList getBedHeights() { 85 public TDoubleArrayList getBedHeights() {
78 return this.diffsPerYear; 86 return this.diffsPerYear;
79 } 87 }
80 88
81 public TDoubleArrayList getDataGap() { 89 public TDoubleArrayList getDataGap1() {
82 return this.dataGap; 90 return this.dataGap1;
91 }
92
93 public TDoubleArrayList getDataGap2() {
94 return this.dataGap2;
83 } 95 }
84 96
85 /* 97 /*
86 public TDoubleArrayList getMorphWidth1() { 98 public TDoubleArrayList getMorphWidth1() {
87 return this.morphWidth1; 99 return this.morphWidth1;
90 public TDoubleArrayList getMorphWidth2() { 102 public TDoubleArrayList getMorphWidth2() {
91 return this.morphWidth2; 103 return this.morphWidth2;
92 } 104 }
93 */ 105 */
94 106
95 public TDoubleArrayList getSoundingWidth() { 107 public TDoubleArrayList getSoundingWidth1() {
96 return this.soundingWidth; 108 return this.soundingWidth1;
109 }
110
111 public TDoubleArrayList getSoundingWidth2() {
112 return this.soundingWidth2;
97 } 113 }
98 114
99 public Integer getStart() { 115 public Integer getStart() {
100 return this.start; 116 return this.start;
101 } 117 }
140 public void addMorphWidth2(double value) { 156 public void addMorphWidth2(double value) {
141 this.morphWidth2.add(value); 157 this.morphWidth2.add(value);
142 } 158 }
143 */ 159 */
144 160
145 public void addSoundingWidth(double value) { 161 public void addSoundingWidth1(double value) {
146 this.soundingWidth.add(value); 162 this.soundingWidth1.add(value);
163 }
164
165 public void addSoundingWidth2(double value) {
166 this.soundingWidth2.add(value);
147 } 167 }
148 168
149 public void addBedHeights(double value) { 169 public void addBedHeights(double value) {
150 this.diffsPerYear.add(value); 170 this.diffsPerYear.add(value);
151 } 171 }
164 morphWidth2.toNativeArray() 184 morphWidth2.toNativeArray()
165 }; 185 };
166 } 186 }
167 */ 187 */
168 188
169 public double[][] getSoundingWidthData() { 189 public double[][] getSoundingWidth1Data() {
170 return new double[][] { 190 return new double[][] {
171 kms.toNativeArray(), 191 kms.toNativeArray(),
172 soundingWidth.toNativeArray() 192 soundingWidth1.toNativeArray()
193 };
194 }
195
196 public double[][] getSoundingWidth2Data() {
197 return new double[][] {
198 kms.toNativeArray(),
199 soundingWidth2.toNativeArray()
200 };
201 }
202
203 public double[][] getDataGap1Data() {
204 return new double[][] {
205 kms.toNativeArray(),
206 dataGap1.toNativeArray()
207 };
208 }
209
210 public double[][] getDataGap2Data() {
211 return new double[][] {
212 kms.toNativeArray(),
213 dataGap2.toNativeArray()
173 }; 214 };
174 } 215 }
175 216
176 public double[][] getHeightPerYearData() { 217 public double[][] getHeightPerYearData() {
177 return new double[][] { 218 return new double[][] {
http://dive4elements.wald.intevation.org