Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffYearResult.java @ 7829:1aba75321441 minfo-opt

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added morph. active width to bed height difference calculation.
author Raimund Renkert <rrenkert@intevation.de>
date Fri, 28 Mar 2014 11:20:49 +0100
parents 974c858a5042
children 76b5add4f268
comparison
equal deleted inserted replaced
7828:8faa8cfd2385 7829:1aba75321441
15 public class BedDiffYearResult 15 public class BedDiffYearResult
16 extends BedDifferencesResult 16 extends BedDifferencesResult
17 { 17 {
18 protected TDoubleArrayList bedHeights; 18 protected TDoubleArrayList bedHeights;
19 protected TDoubleArrayList dataGap; 19 protected TDoubleArrayList dataGap;
20 protected TDoubleArrayList morphWidth; 20 protected TDoubleArrayList soundingWidth;
21 protected TDoubleArrayList morphWidth1;
22 protected TDoubleArrayList morphWidth2;
21 protected int start; 23 protected int start;
22 protected int end; 24 protected int end;
23 protected String nameFirst; 25 protected String nameFirst;
24 protected String nameSecond; 26 protected String nameSecond;
25 27
26 public BedDiffYearResult () { 28 public BedDiffYearResult () {
27 super(); 29 super();
28 this.bedHeights = new TDoubleArrayList(); 30 this.bedHeights = new TDoubleArrayList();
29 this.dataGap = new TDoubleArrayList(); 31 this.dataGap = new TDoubleArrayList();
30 this.morphWidth = new TDoubleArrayList(); 32 this.soundingWidth = new TDoubleArrayList();
33 this.morphWidth1 = new TDoubleArrayList();
34 this.morphWidth2 = new TDoubleArrayList();
31 this.start = -1; 35 this.start = -1;
32 this.end = -1; 36 this.end = -1;
33 } 37 }
34 38
35 /** 39 /**
42 public BedDiffYearResult( 46 public BedDiffYearResult(
43 TDoubleArrayList kms, 47 TDoubleArrayList kms,
44 TDoubleArrayList differences, 48 TDoubleArrayList differences,
45 TDoubleArrayList heights1, 49 TDoubleArrayList heights1,
46 TDoubleArrayList heights2, 50 TDoubleArrayList heights2,
47 TDoubleArrayList morphWidth, 51 TDoubleArrayList morphWidth1,
52 TDoubleArrayList morphWidth2,
53 TDoubleArrayList soundingWidth,
48 TDoubleArrayList bedHeights, 54 TDoubleArrayList bedHeights,
49 TDoubleArrayList dataGap, 55 TDoubleArrayList dataGap,
50 int start, 56 int start,
51 int end, 57 int end,
52 String nameFirst, 58 String nameFirst,
53 String nameSecond 59 String nameSecond
54 ) { 60 ) {
55 super(kms, differences, heights1, heights2); 61 super(kms, differences, heights1, heights2);
56 this.bedHeights = bedHeights; 62 this.bedHeights = bedHeights;
57 this.dataGap = dataGap; 63 this.dataGap = dataGap;
58 this.morphWidth = morphWidth; 64 this.soundingWidth = soundingWidth;
65 this.morphWidth1 = morphWidth1;
66 this.morphWidth2 = morphWidth2;
59 this.start = start; 67 this.start = start;
60 this.end = end; 68 this.end = end;
61 this.nameFirst = nameFirst; 69 this.nameFirst = nameFirst;
62 this.nameSecond = nameSecond; 70 this.nameSecond = nameSecond;
63 } 71 }
68 76
69 public TDoubleArrayList getDataGap() { 77 public TDoubleArrayList getDataGap() {
70 return this.dataGap; 78 return this.dataGap;
71 } 79 }
72 80
73 public TDoubleArrayList getMorphWidth() { 81 public TDoubleArrayList getMorphWidth1() {
74 return this.morphWidth; 82 return this.morphWidth1;
83 }
84
85 public TDoubleArrayList getMorphWidth2() {
86 return this.morphWidth2;
87 }
88
89 public TDoubleArrayList getSoundingWidth() {
90 return this.soundingWidth;
75 } 91 }
76 92
77 public int getStart() { 93 public int getStart() {
78 return this.start; 94 return this.start;
79 } 95 }
98 /** Get name of the second BedHeight (subtrahend). */ 114 /** Get name of the second BedHeight (subtrahend). */
99 public String getNameSecond() { 115 public String getNameSecond() {
100 return this.nameSecond; 116 return this.nameSecond;
101 } 117 }
102 118
103 public void addMorphWidth(double value) { 119 public void addMorphWidth1(double value) {
104 this.morphWidth.add(value); 120 this.morphWidth1.add(value);
121 }
122
123 public void addMorphWidth2(double value) {
124 this.morphWidth2.add(value);
125 }
126
127 public void addSoundingWidth(double value) {
128 this.soundingWidth.add(value);
105 } 129 }
106 130
107 public void addBedHeights(double value) { 131 public void addBedHeights(double value) {
108 this.bedHeights.add(value); 132 this.bedHeights.add(value);
109 } 133 }
110 134
111 public double[][] getMorphWidthData() { 135 public double[][] getMorphWidth1Data() {
112 return new double[][] { 136 return new double[][] {
113 kms.toNativeArray(), 137 kms.toNativeArray(),
114 morphWidth.toNativeArray() 138 morphWidth1.toNativeArray()
139 };
140 }
141
142 public double[][] getMorphWidth2Data() {
143 return new double[][] {
144 kms.toNativeArray(),
145 morphWidth2.toNativeArray()
146 };
147 }
148
149 public double[][] getSoundingWidthData() {
150 return new double[][] {
151 kms.toNativeArray(),
152 soundingWidth.toNativeArray()
115 }; 153 };
116 } 154 }
117 155
118 public double[][] getHeightPerYearData() { 156 public double[][] getHeightPerYearData() {
119 return new double[][] { 157 return new double[][] {
http://dive4elements.wald.intevation.org