Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffYearResult.java @ 8420:8a14605fb64a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed morpho width from bed height diffs.
author Sascha L. Teichmann <teichmann@intevation.de>
date Fri, 17 Oct 2014 12:50:35 +0200
parents 5c3b36b519d0
children 96bf5135cd0e
comparison
equal deleted inserted replaced
8419:d7d74392cc46 8420:8a14605fb64a
16 extends BedDifferencesResult 16 extends BedDifferencesResult
17 { 17 {
18 protected TDoubleArrayList diffsPerYear; 18 protected TDoubleArrayList diffsPerYear;
19 protected TDoubleArrayList dataGap; 19 protected TDoubleArrayList dataGap;
20 protected TDoubleArrayList soundingWidth; 20 protected TDoubleArrayList soundingWidth;
21 protected TDoubleArrayList morphWidth1; 21 //protected TDoubleArrayList morphWidth1;
22 protected TDoubleArrayList morphWidth2; 22 //protected TDoubleArrayList morphWidth2;
23 protected Integer start; 23 protected Integer start;
24 protected Integer end; 24 protected Integer end;
25 protected String nameFirst; 25 protected String nameFirst;
26 protected String nameSecond; 26 protected String nameSecond;
27 protected int idFirst; 27 protected int idFirst;
30 public BedDiffYearResult () { 30 public BedDiffYearResult () {
31 super(); 31 super();
32 this.diffsPerYear = new TDoubleArrayList(); 32 this.diffsPerYear = new TDoubleArrayList();
33 this.dataGap = new TDoubleArrayList(); 33 this.dataGap = new TDoubleArrayList();
34 this.soundingWidth = new TDoubleArrayList(); 34 this.soundingWidth = new TDoubleArrayList();
35 this.morphWidth1 = new TDoubleArrayList(); 35 //this.morphWidth1 = new TDoubleArrayList();
36 this.morphWidth2 = new TDoubleArrayList(); 36 //this.morphWidth2 = new TDoubleArrayList();
37 } 37 }
38 38
39 /** 39 /**
40 * @param kms the stations the following parameters are connected to. 40 * @param kms the stations the following parameters are connected to.
41 * @param differences the height differences 41 * @param differences the height differences
46 public BedDiffYearResult( 46 public BedDiffYearResult(
47 TDoubleArrayList kms, 47 TDoubleArrayList kms,
48 TDoubleArrayList differences, 48 TDoubleArrayList differences,
49 TDoubleArrayList heights1, 49 TDoubleArrayList heights1,
50 TDoubleArrayList heights2, 50 TDoubleArrayList heights2,
51 TDoubleArrayList morphWidth1, 51 //TDoubleArrayList morphWidth1,
52 TDoubleArrayList morphWidth2, 52 //TDoubleArrayList morphWidth2,
53 TDoubleArrayList soundingWidth, 53 TDoubleArrayList soundingWidth,
54 TDoubleArrayList diffsPerYear, 54 TDoubleArrayList diffsPerYear,
55 TDoubleArrayList dataGap, 55 TDoubleArrayList dataGap,
56 Integer start, 56 Integer start,
57 Integer end, 57 Integer end,
62 ) { 62 ) {
63 super(kms, differences, heights1, heights2); 63 super(kms, differences, heights1, heights2);
64 this.diffsPerYear = diffsPerYear; 64 this.diffsPerYear = diffsPerYear;
65 this.dataGap = dataGap; 65 this.dataGap = dataGap;
66 this.soundingWidth = soundingWidth; 66 this.soundingWidth = soundingWidth;
67 this.morphWidth1 = morphWidth1; 67 //this.morphWidth1 = morphWidth1;
68 this.morphWidth2 = morphWidth2; 68 //this.morphWidth2 = morphWidth2;
69 this.start = start; 69 this.start = start;
70 this.end = end; 70 this.end = end;
71 this.nameFirst = nameFirst; 71 this.nameFirst = nameFirst;
72 this.nameSecond = nameSecond; 72 this.nameSecond = nameSecond;
73 this.idFirst = idFirst; 73 this.idFirst = idFirst;
80 80
81 public TDoubleArrayList getDataGap() { 81 public TDoubleArrayList getDataGap() {
82 return this.dataGap; 82 return this.dataGap;
83 } 83 }
84 84
85 /*
85 public TDoubleArrayList getMorphWidth1() { 86 public TDoubleArrayList getMorphWidth1() {
86 return this.morphWidth1; 87 return this.morphWidth1;
87 } 88 }
88 89
89 public TDoubleArrayList getMorphWidth2() { 90 public TDoubleArrayList getMorphWidth2() {
90 return this.morphWidth2; 91 return this.morphWidth2;
91 } 92 }
93 */
92 94
93 public TDoubleArrayList getSoundingWidth() { 95 public TDoubleArrayList getSoundingWidth() {
94 return this.soundingWidth; 96 return this.soundingWidth;
95 } 97 }
96 98
128 /** Get id of the second BedHeight (subtrahend). */ 130 /** Get id of the second BedHeight (subtrahend). */
129 public int getIdSecond() { 131 public int getIdSecond() {
130 return this.idSecond; 132 return this.idSecond;
131 } 133 }
132 134
135 /*
133 public void addMorphWidth1(double value) { 136 public void addMorphWidth1(double value) {
134 this.morphWidth1.add(value); 137 this.morphWidth1.add(value);
135 } 138 }
136 139
137 public void addMorphWidth2(double value) { 140 public void addMorphWidth2(double value) {
138 this.morphWidth2.add(value); 141 this.morphWidth2.add(value);
139 } 142 }
143 */
140 144
141 public void addSoundingWidth(double value) { 145 public void addSoundingWidth(double value) {
142 this.soundingWidth.add(value); 146 this.soundingWidth.add(value);
143 } 147 }
144 148
145 public void addBedHeights(double value) { 149 public void addBedHeights(double value) {
146 this.diffsPerYear.add(value); 150 this.diffsPerYear.add(value);
147 } 151 }
148 152
153 /*
149 public double[][] getMorphWidth1Data() { 154 public double[][] getMorphWidth1Data() {
150 return new double[][] { 155 return new double[][] {
151 kms.toNativeArray(), 156 kms.toNativeArray(),
152 morphWidth1.toNativeArray() 157 morphWidth1.toNativeArray()
153 }; 158 };
157 return new double[][] { 162 return new double[][] {
158 kms.toNativeArray(), 163 kms.toNativeArray(),
159 morphWidth2.toNativeArray() 164 morphWidth2.toNativeArray()
160 }; 165 };
161 } 166 }
167 */
162 168
163 public double[][] getSoundingWidthData() { 169 public double[][] getSoundingWidthData() {
164 return new double[][] { 170 return new double[][] {
165 kms.toNativeArray(), 171 kms.toNativeArray(),
166 soundingWidth.toNativeArray() 172 soundingWidth.toNativeArray()
http://dive4elements.wald.intevation.org