changeset 7828:8faa8cfd2385 minfo-opt

Renamed the incorrectly named morph width to sounding width.
author Raimund Renkert <rrenkert@intevation.de>
date Thu, 27 Mar 2014 14:56:34 +0100
parents 982382d9ea8b
children 1aba75321441
files artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightSingleData.java artifacts/src/main/java/org/dive4elements/river/exports/process/BedWidthProcessor.java
diffstat 3 files changed, 22 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java	Thu Mar 20 13:36:59 2014 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java	Thu Mar 27 14:56:34 2014 +0100
@@ -133,13 +133,13 @@
         TDoubleArrayList stations = s1.getStations();
         int size = stations.size();
 
-        TDoubleArrayList diffRes  = new TDoubleArrayList(size);
-        TDoubleArrayList kms      = new TDoubleArrayList(size);
-        TDoubleArrayList morphs   = new TDoubleArrayList(size);
-        TDoubleArrayList absolute = new TDoubleArrayList(size);
-        TDoubleArrayList gap      = new TDoubleArrayList(size);
-        TDoubleArrayList heights1 = new TDoubleArrayList(size);
-        TDoubleArrayList heights2 = new TDoubleArrayList(size);
+        TDoubleArrayList diffRes   = new TDoubleArrayList(size);
+        TDoubleArrayList kms       = new TDoubleArrayList(size);
+        TDoubleArrayList soundings = new TDoubleArrayList(size);
+        TDoubleArrayList absolute  = new TDoubleArrayList(size);
+        TDoubleArrayList gap       = new TDoubleArrayList(size);
+        TDoubleArrayList heights1  = new TDoubleArrayList(size);
+        TDoubleArrayList heights2  = new TDoubleArrayList(size);
 
         int range = Math.abs(s1.getYear() - s2.getYear());
 
@@ -153,9 +153,9 @@
                 diffRes.add(hDiff);
                 kms.add(station);
 
-                morphs.add(Math.max(
-                    s1.getMorphWidth(station),
-                    s2.getMorphWidth(station)));
+                soundings.add(Math.max(
+                    s1.getSoundingWidth(station),
+                    s2.getSoundingWidth(station)));
 
                 gap.add(Math.max(
                     s1.getDataGap(station),
@@ -171,7 +171,7 @@
             diffRes,
             heights1,
             heights2,
-            morphs,
+            soundings,
             absolute,
             gap,
             s1.getYear(),
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightSingleData.java	Thu Mar 20 13:36:59 2014 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightSingleData.java	Thu Mar 27 14:56:34 2014 +0100
@@ -16,20 +16,20 @@
 {
     protected int year;
     protected TDoubleArrayList data_gap;
-    protected TDoubleArrayList morphWidth;
+    protected TDoubleArrayList soundingWidth;
 
     public BedHeightSingleData() {
         super();
         this.year = -1;
         data_gap = new TDoubleArrayList();
-        morphWidth = new TDoubleArrayList();
+        soundingWidth = new TDoubleArrayList();
     }
 
     public BedHeightSingleData(String name) {
         super(name);
         this.year = -1;
         data_gap = new TDoubleArrayList();
-        morphWidth = new TDoubleArrayList();
+        soundingWidth = new TDoubleArrayList();
     }
 
     public void add(
@@ -42,24 +42,24 @@
         super.add(value, station);
         this.year = year;
         this.data_gap.add(gap);
-        this.morphWidth.add(width);
+        this.soundingWidth.add(width);
     }
 
     public int getYear() {
         return this.year;
     }
 
-    public double getMorphWidth(int idx) {
-        return this.morphWidth.getQuick(idx);
+    public double getSoundingWidth(int idx) {
+        return this.soundingWidth.getQuick(idx);
     }
 
     public double getDataGap(int idx) {
         return this.data_gap.getQuick(idx);
     }
 
-    public double getMorphWidth(double station) {
+    public double getSoundingWidth(double station) {
         int index = this.station.indexOf(station);
-        return index >= 0 ? morphWidth.getQuick(index): Double.NaN;
+        return index >= 0 ? soundingWidth.getQuick(index): Double.NaN;
     }
 
     public double getDataGap(double station) {
@@ -67,7 +67,7 @@
         return index >= 0 ? data_gap.getQuick(index) : Double.NaN;
     }
 
-    public double[] getMorphWidths() {
-        return this.morphWidth.toNativeArray();
+    public double[] getSoundingWidths() {
+        return this.soundingWidth.toNativeArray();
     }
 }
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/BedWidthProcessor.java	Thu Mar 20 13:36:59 2014 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/BedWidthProcessor.java	Thu Mar 27 14:56:34 2014 +0100
@@ -56,7 +56,7 @@
             StyledSeriesBuilder.addPoints(series, bData.getAsArray(), true);
         } else if (data instanceof BedHeightSingleData) {
             BedHeightSingleData bData = (BedHeightSingleData)data;
-            double[] width = bData.getMorphWidths();
+            double[] width = bData.getSoundingWidths();
             double[] stations = bData.getStations().toNativeArray();
 
             for (int i = 0; i < width.length; i++) {

http://dive4elements.wald.intevation.org