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

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
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffYearResult.java	Thu Mar 27 14:56:34 2014 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffYearResult.java	Fri Mar 28 11:20:49 2014 +0100
@@ -17,7 +17,9 @@
 {
     protected TDoubleArrayList bedHeights;
     protected TDoubleArrayList dataGap;
-    protected TDoubleArrayList morphWidth;
+    protected TDoubleArrayList soundingWidth;
+    protected TDoubleArrayList morphWidth1;
+    protected TDoubleArrayList morphWidth2;
     protected int start;
     protected int end;
     protected String nameFirst;
@@ -27,7 +29,9 @@
         super();
         this.bedHeights = new TDoubleArrayList();
         this.dataGap = new TDoubleArrayList();
-        this.morphWidth = new TDoubleArrayList();
+        this.soundingWidth = new TDoubleArrayList();
+        this.morphWidth1 = new TDoubleArrayList();
+        this.morphWidth2 = new TDoubleArrayList();
         this.start = -1;
         this.end = -1;
     }
@@ -44,7 +48,9 @@
         TDoubleArrayList differences,
         TDoubleArrayList heights1,
         TDoubleArrayList heights2,
-        TDoubleArrayList morphWidth,
+        TDoubleArrayList morphWidth1,
+        TDoubleArrayList morphWidth2,
+        TDoubleArrayList soundingWidth,
         TDoubleArrayList bedHeights,
         TDoubleArrayList dataGap,
         int start,
@@ -55,7 +61,9 @@
         super(kms, differences, heights1, heights2);
         this.bedHeights = bedHeights;
         this.dataGap = dataGap;
-        this.morphWidth = morphWidth;
+        this.soundingWidth = soundingWidth;
+        this.morphWidth1 = morphWidth1;
+        this.morphWidth2 = morphWidth2;
         this.start = start;
         this.end = end;
         this.nameFirst = nameFirst;
@@ -70,8 +78,16 @@
         return this.dataGap;
     }
 
-    public TDoubleArrayList getMorphWidth() {
-        return this.morphWidth;
+    public TDoubleArrayList getMorphWidth1() {
+        return this.morphWidth1;
+    }
+
+    public TDoubleArrayList getMorphWidth2() {
+        return this.morphWidth2;
+    }
+
+    public TDoubleArrayList getSoundingWidth() {
+        return this.soundingWidth;
     }
 
     public int getStart() {
@@ -100,18 +116,40 @@
         return this.nameSecond;
     }
 
-    public void addMorphWidth(double value) {
-        this.morphWidth.add(value);
+    public void addMorphWidth1(double value) {
+        this.morphWidth1.add(value);
+    }
+
+    public void addMorphWidth2(double value) {
+        this.morphWidth2.add(value);
+    }
+
+    public void addSoundingWidth(double value) {
+        this.soundingWidth.add(value);
     }
 
     public void addBedHeights(double value) {
         this.bedHeights.add(value);
     }
 
-    public double[][] getMorphWidthData() {
+    public double[][] getMorphWidth1Data() {
         return new double[][] {
             kms.toNativeArray(),
-            morphWidth.toNativeArray()
+            morphWidth1.toNativeArray()
+        };
+    }
+
+    public double[][] getMorphWidth2Data() {
+        return new double[][] {
+            kms.toNativeArray(),
+            morphWidth2.toNativeArray()
+        };
+    }
+
+    public double[][] getSoundingWidthData() {
+        return new double[][] {
+            kms.toNativeArray(),
+            soundingWidth.toNativeArray()
         };
     }
 

http://dive4elements.wald.intevation.org