Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java @ 8422:96bf5135cd0e
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 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java Fri Oct 17 13:17:12 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java Fri Oct 17 13:34:08 2014 +0200 @@ -69,13 +69,15 @@ TDoubleArrayList stations = s1.getStations(); int size = stations.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); + TDoubleArrayList diffRes = new TDoubleArrayList(size); + TDoubleArrayList kms = new TDoubleArrayList(size); + TDoubleArrayList soundings1 = new TDoubleArrayList(size); + TDoubleArrayList soundings2 = new TDoubleArrayList(size); + TDoubleArrayList absolute = new TDoubleArrayList(size); + TDoubleArrayList gap1 = new TDoubleArrayList(size); + TDoubleArrayList gap2 = new TDoubleArrayList(size); + TDoubleArrayList heights1 = new TDoubleArrayList(size); + TDoubleArrayList heights2 = new TDoubleArrayList(size); //TDoubleArrayList morphs1 = new TDoubleArrayList(size); //TDoubleArrayList morphs2 = new TDoubleArrayList(size); @@ -96,13 +98,11 @@ diffRes.add(hDiff); kms.add(station); - soundings.add(Math.max( - s1.getSoundingWidth(station), - s2.getSoundingWidth(station))); + soundings1.add(s1.getSoundingWidth(station)); + soundings2.add(s2.getSoundingWidth(station)); - gap.add(Math.max( - s1.getDataGap(station), - s2.getDataGap(station))); + gap1.add(s1.getDataGap(station)); + gap2.add(s2.getDataGap(station)); if (range != null) { absolute.add((hDiff / range) * 100d); @@ -120,9 +120,11 @@ heights2, //morphs1, //morphs2, - soundings, + soundings1, + soundings2, absolute, - gap, + gap1, + gap2, s1.getYear(), s2.getYear(), s1.getName(),