Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/exports/minfo/SedimentLoadExporter.java @ 7018:acb63fd3c8d3
issue1465: Assume that a "0" measurement for total sediment load is
unlikely enough that we will not encounter it. Replace "0" total
values with " ".
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Mon, 16 Sep 2013 09:52:28 +0200 |
| parents | b1fadc5af121 |
| children | 0a337f0005c2 |
comparison
equal
deleted
inserted
replaced
| 7017:b9633d6ce57e | 7018:acb63fd3c8d3 |
|---|---|
| 105 writeRecord(writer, km, years, fraction); | 105 writeRecord(writer, km, years, fraction); |
| 106 } | 106 } |
| 107 } | 107 } |
| 108 } | 108 } |
| 109 | 109 |
| 110 | |
| 111 /** Return space when val is NaN, apply NumberFormat otherwise. */ | |
| 110 private String numberToString(NumberFormat valf, double val) { | 112 private String numberToString(NumberFormat valf, double val) { |
| 111 if (Double.isNaN(val)) { | 113 if (Double.isNaN(val)) { |
| 114 return " "; | |
| 115 } | |
| 116 return valf.format(val); | |
| 117 } | |
| 118 | |
| 119 /** Return space when val is NaN or zero, apply NumberFormat otherwise. */ | |
| 120 private String nonZeroToString(NumberFormat valf, double val) { | |
| 121 if (Double.isNaN(val) || val == 0d) { | |
| 112 return " "; | 122 return " "; |
| 113 } | 123 } |
| 114 return valf.format(val); | 124 return valf.format(val); |
| 115 } | 125 } |
| 116 | 126 |
| 131 numberToString(valf, fraction.getSuspSand()), | 141 numberToString(valf, fraction.getSuspSand()), |
| 132 numberToString(valf, fraction.getSuspSandBed()), | 142 numberToString(valf, fraction.getSuspSandBed()), |
| 133 numberToString(valf, fraction.getSand()), | 143 numberToString(valf, fraction.getSand()), |
| 134 numberToString(valf, fraction.getFineMiddle()), | 144 numberToString(valf, fraction.getFineMiddle()), |
| 135 numberToString(valf, fraction.getCoarse()), | 145 numberToString(valf, fraction.getCoarse()), |
| 136 numberToString(valf, fraction.getTotal()) | 146 nonZeroToString(valf, fraction.getTotal()) |
| 137 }); | 147 }); |
| 138 } | 148 } |
| 139 | 149 |
| 140 /** Writes i18ned header for csv file/stream. */ | 150 /** Writes i18ned header for csv file/stream. */ |
| 141 protected void writeCSVHeader(CSVWriter writer) { | 151 protected void writeCSVHeader(CSVWriter writer) { |