Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/exports/minfo/SedimentLoadExporter.java @ 7007:d584100063dd
issue1465: Prepare SedimentLoadExporter to show "-" for NaN-values.
Unfortunately, the calculation breaks at other places if NaN-values are seen.
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Fri, 13 Sep 2013 12:30:42 +0200 |
parents | 81f84960d722 |
children | b1fadc5af121 |
comparison
equal
deleted
inserted
replaced
7006:5fe8c64b48d4 | 7007:d584100063dd |
---|---|
105 writeRecord(writer, km, years, fraction); | 105 writeRecord(writer, km, years, fraction); |
106 } | 106 } |
107 } | 107 } |
108 } | 108 } |
109 | 109 |
110 private String numberToString(NumberFormat valf, double val) { | |
111 if (Double.isNaN(val)) { | |
112 return "-"; | |
113 } | |
114 return valf.format(val); | |
115 } | |
116 | |
110 /** Write a line. */ | 117 /** Write a line. */ |
111 private void writeRecord( | 118 private void writeRecord( |
112 CSVWriter writer, | 119 CSVWriter writer, |
113 double km, | 120 double km, |
114 String years, | 121 String years, |
118 NumberFormat kmf = Formatter.getCalculationKm(context.getMeta()); | 125 NumberFormat kmf = Formatter.getCalculationKm(context.getMeta()); |
119 NumberFormat valf = Formatter.getFormatter(context.getMeta(), 0, 2); | 126 NumberFormat valf = Formatter.getFormatter(context.getMeta(), 0, 2); |
120 writer.writeNext(new String[] { | 127 writer.writeNext(new String[] { |
121 kmf.format(km), | 128 kmf.format(km), |
122 years, | 129 years, |
123 valf.format(fraction.getSuspSediment()), | 130 numberToString(valf, fraction.getSuspSediment()), |
124 valf.format(fraction.getSuspSand()), | 131 numberToString(valf, fraction.getSuspSand()), |
125 valf.format(fraction.getSuspSandBed()), | 132 numberToString(valf, fraction.getSuspSandBed()), |
126 valf.format(fraction.getSand()), | 133 numberToString(valf, fraction.getSand()), |
127 valf.format(fraction.getFineMiddle()), | 134 numberToString(valf, fraction.getFineMiddle()), |
128 valf.format(fraction.getCoarse()), | 135 numberToString(valf, fraction.getCoarse()), |
129 valf.format(fraction.getTotal()) | 136 numberToString(valf, fraction.getTotal()) |
130 }); | 137 }); |
131 } | 138 } |
132 | 139 |
133 /** Writes i18ned header for csv file/stream. */ | 140 /** Writes i18ned header for csv file/stream. */ |
134 protected void writeCSVHeader(CSVWriter writer) { | 141 protected void writeCSVHeader(CSVWriter writer) { |