diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcOverviewResult.java @ 9157:f9bb5d0a6ff3

Added the S-Info collision calculation and chart output
author mschaefer
date Tue, 19 Jun 2018 14:19:32 +0200
parents 23945061daec
children f1be005f0c46
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcOverviewResult.java	Tue Jun 19 14:16:45 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcOverviewResult.java	Tue Jun 19 14:19:32 2018 +0200
@@ -17,14 +17,15 @@
 import org.dive4elements.river.artifacts.common.GeneralResultType;
 import org.dive4elements.river.artifacts.common.MetaAndTableJRDataSource;
 import org.dive4elements.river.artifacts.common.ResultRow;
+import org.dive4elements.river.artifacts.sinfo.common.SInfoResultType;
 import org.dive4elements.river.artifacts.sinfo.util.RiverInfo;
 
 /**
- * Contains the results of a {@link FloodDurationCalculation}.
+ * Contains the results of a {@link CollisionCalculation}.
  *
  * @author Gernot Belger
  */
-final class CollisionCalcOverviewResult extends AbstractCalculationExportableResult<CollisionCalculationResults> {
+final public class CollisionCalcOverviewResult extends AbstractCalculationExportableResult<CollisionCalculationResults> {
 
     private static final long serialVersionUID = 1L;
 
@@ -44,18 +45,11 @@
     @Override
     public void writeCSVHeader(final ExportContextCSV exportContextCSV, final CollisionCalculationResults results, final RiverInfo river) {
 
-        // FIXME wrong columns:
-        final Collection<String> header = new ArrayList<>(99);
+        final Collection<String> header = new ArrayList<>(3);
 
         header.add(exportContextCSV.formatCsvHeader(GeneralResultType.station));
-        //
-        // header.add(exportContext.formatCsvHeader(SInfoResultType.riverside));
-        // header.add(exportContext.formatCsvHeader(SInfoResultType.inundationduration));
-        // header.add(exportContext.formatCsvHeader(SInfoResultType.inundationdurationq));
-        // header.add(exportContext.formatCsvHeader(SInfoResultType.infrastructureHeight));
-        // header.add(exportContext.formatCsvHeader(SInfoResultType.infrastructuretype));
-        // header.add(exportContext.formatCsvHeader(SInfoResultType.gaugeLabel));
-        // header.add(exportContext.formatCsvHeader(SInfoResultType.location));
+        header.add(exportContextCSV.formatCsvHeader(SInfoResultType.years));
+        header.add(exportContextCSV.formatCsvHeader(SInfoResultType.collisionCount));
 
         exportContextCSV.writeCSVLine(header.toArray(new String[header.size()]));
     }
@@ -67,22 +61,21 @@
 
     @Override
     protected String[] formatPDFRow(final ExportContextCSV exportContextCSV, final CollisionCalculationResults results, final ResultRow row) {
-        return formatRow(exportContextCSV, results, row);
+        final Collection<String> lines = new ArrayList<>(3);
+
+        lines.add(exportContextCSV.formatRowValue(row, GeneralResultType.station));
+
+        return lines.toArray(new String[lines.size()]);
+        // return formatRow(exportContextCSV, results, row);
     }
 
     private String[] formatRow(final ExportContextCSV exportContextCSV, final CollisionCalculationResults results, final ResultRow row) {
 
-        final Collection<String> lines = new ArrayList<>(11);
+        final Collection<String> lines = new ArrayList<>(3);
 
-        // FIXME wrong columns:
         lines.add(exportContextCSV.formatRowValue(row, GeneralResultType.station));
-        // lines.add(exportContext.formatRowValue(row, SInfoResultType.tkh));
-        // lines.add(exportContext.formatRowValue(row, SInfoResultType.soilkind));
-        // lines.add(exportContext.formatRowValue(row, SInfoResultType.meanBedHeight));
-        // lines.add(exportContext.formatRowValue(row, SInfoResultType.waterlevel));
-        // lines.add(exportContext.formatRowValue(row, SInfoResultType.discharge));
-        // lines.add(exportContext.formatRowValue(row, SInfoResultType.gaugeLabel));
-        // lines.add(exportContext.formatRowValue(row, SInfoResultType.location));
+        lines.add(exportContextCSV.formatRowValue(row, SInfoResultType.years));
+        lines.add(exportContextCSV.formatRowValue(row, SInfoResultType.collisionCount));
 
         return lines.toArray(new String[lines.size()]);
     }
@@ -96,13 +89,8 @@
     protected void addJRTableHeader(final ExportContextCSV exportContextCSV, final MetaAndTableJRDataSource source, final CollisionCalculationResults results) {
 
         /* column headings */
-        // FIXME wrong columns:
         exportContextCSV.addJRMetadata(source, "station_header", GeneralResultType.station);
-        // exportContext.addJRMetadata(source, "station_header", GeneralResultType.station);
-        // exportContext.addJRMetadata(source, "tkh_header", SInfoResultType.tkh);
-        // exportContext.addJRMetadata(source, "tkhkind_header", SInfoResultType.soilkind);
-        // exportContext.addJRMetadata(source, "bedheight_header", SInfoResultType.meanBedHeight);
-        // exportContext.addJRMetadata(source, "waterlevel_header", SInfoResultType.waterlevel);
-        // exportContext.addJRMetadata(source, "discharge_header", SInfoResultType.discharge);
+        // exportContextCSV.addJRMetadata(source, "years_header", SInfoResultType.years);
+        // exportContextCSV.addJRMetadata(source, "collisioncount_header", SInfoResultType.collisionCount);
     }
 }
\ No newline at end of file

http://dive4elements.wald.intevation.org