Mercurial > dive4elements > river
comparison backend/src/main/java/org/dive4elements/river/importer/parsers/FlowVelocityModelParser.java @ 8991:c43d8c1a4455
Parse via decimalformat instead of bigdecimal constructor (to cope with strings with chars after the actual number)
| author | mschaefer |
|---|---|
| date | Tue, 10 Apr 2018 16:43:32 +0200 |
| parents | 2693bfaf503d |
| children |
comparison
equal
deleted
inserted
replaced
| 8990:07dcedddf839 | 8991:c43d8c1a4455 |
|---|---|
| 10 | 10 |
| 11 import java.io.File; | 11 import java.io.File; |
| 12 import java.io.IOException; | 12 import java.io.IOException; |
| 13 import java.math.BigDecimal; | 13 import java.math.BigDecimal; |
| 14 import java.text.NumberFormat; | 14 import java.text.NumberFormat; |
| 15 import java.text.ParseException; | |
| 15 import java.util.ArrayList; | 16 import java.util.ArrayList; |
| 16 import java.util.List; | 17 import java.util.List; |
| 17 import java.util.TreeSet; | 18 import java.util.TreeSet; |
| 18 import java.util.regex.Matcher; | 19 import java.util.regex.Matcher; |
| 19 import java.util.regex.Pattern; | 20 import java.util.regex.Pattern; |
| 233 try { | 234 try { |
| 234 return new Object[] { | 235 return new Object[] { |
| 235 name, | 236 name, |
| 236 AbstractParser.parseDecimal(qStr) }; | 237 AbstractParser.parseDecimal(qStr) }; |
| 237 } | 238 } |
| 238 catch (final NumberFormatException pe) { | 239 catch (final ParseException pe) { |
| 239 log.warn("Could not parse Q value: '" + qStr + "'"); | 240 log.warn("Could not parse Q value: '" + qStr + "'"); |
| 240 } | 241 } |
| 241 } | 242 } |
| 242 | 243 |
| 243 return null; | 244 return null; |
| 269 | 270 |
| 270 this.current.addValue(new ImportFlowVelocityModelValue(km, q, total, main, stress)); | 271 this.current.addValue(new ImportFlowVelocityModelValue(km, q, total, main, stress)); |
| 271 | 272 |
| 272 this.kmExists.add(key); | 273 this.kmExists.add(key); |
| 273 } | 274 } |
| 274 catch (final NumberFormatException pe) { | 275 catch (final ParseException pe) { |
| 275 log.warn("Unparseable flow velocity values:", pe); | 276 log.warn("Unparseable flow velocity values:", pe); |
| 276 } | 277 } |
| 277 } | 278 } |
| 278 } | 279 } |
| 279 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : | 280 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : |