diff artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult2.java @ 9448:d32b11d585cd

CSV-Export bundu.wst fehlvolumen
author gernotbelger
date Wed, 22 Aug 2018 11:51:46 +0200
parents e60584f2a531
children 7e1fb8d0cb0d
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult2.java	Wed Aug 22 09:00:54 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstMissVolCalculationResult2.java	Wed Aug 22 11:51:46 2018 +0200
@@ -62,7 +62,8 @@
         assert (vFields.size() == fieldSize()); // immer abgleichen mit der Calculation!
         @SuppressWarnings("unchecked")
         final List<Double> mFields = (List<Double>) row.getValue(BunduResultType.missMassFields);
-        for (int i = 0; i <= vFields.size() - 1; i++) {
+        assert (vFields.size() == mFields.size());
+        for (int i = 0; i < vFields.size(); i++) {
             lines.add(BunduResultType.missVolumeFields.exportValue(exportContext.getContext(), vFields.get(i)));
             lines.add(BunduResultType.missMassFields.exportValue(exportContext.getContext(), mFields.get(i)));
         }
@@ -81,9 +82,11 @@
 
         header.add(exportContextCSV.formatCsvHeader(GeneralResultType.station));
 
-        for (int i = 1; i <= fieldSize(); i++) {
-            header.add(exportContextCSV.msg(fieldVolumeMsgKey, i));
-            header.add(exportContextCSV.msg(fieldMassMsgKey, i));
+        for (int i = 1; i <= fieldSize() * 2; i++) {
+            final double index = Math.ceil(i / 2.);
+            header.add(exportContextCSV.msg(fieldVolumeMsgKey, index));
+            i++;
+            header.add(exportContextCSV.msg(fieldMassMsgKey, index));
         }
         header.add(exportContextCSV.formatCsvHeader(BunduResultType.missVolumeMeanBed));
         header.add(exportContextCSV.formatCsvHeader(BunduResultType.missMassMeanBed));

http://dive4elements.wald.intevation.org