Mercurial > dive4elements > river
comparison backend/src/main/java/org/dive4elements/river/importer/parsers/SQRelationParser.java @ 7340:2ce7bacc940f double-precision
Merged changes from default into double precision branch.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Tue, 15 Oct 2013 18:41:55 +0200 |
| parents | c894b7b45c4c |
| children | 07cc4cd9233e |
comparison
equal
deleted
inserted
replaced
| 7334:f7d3fc619976 | 7340:2ce7bacc940f |
|---|---|
| 125 Double rSq = parseDouble(cols[9], line); | 125 Double rSq = parseDouble(cols[9], line); |
| 126 Integer nTot = parseInteger(cols[10], line); | 126 Integer nTot = parseInteger(cols[10], line); |
| 127 Integer nOutlier = parseInteger(cols[11], line); | 127 Integer nOutlier = parseInteger(cols[11], line); |
| 128 Double cFer = parseDouble(cols[12], line); | 128 Double cFer = parseDouble(cols[12], line); |
| 129 Double cDuan = parseDouble(cols[13], line); | 129 Double cDuan = parseDouble(cols[13], line); |
| 130 if (km == null || a == null || b == null || | 130 |
| 131 qMax == null || cols[1].length() == 0) { | 131 if (km == null || a == null || b == null |
| 132 if (km == null) { | 132 || qMax == null || cols[1].length() == 0 |
| 133 log.error("No km for measurement station: Can not reference measurement station: " | 133 ) { |
| 134 + line); | 134 if (km == null) { |
| 135 } | 135 log.error("No km for measurement station: Can not reference measurement station: " |
| 136 if ( a == null || b == null || | 136 + line); |
| 137 qMax == null || cols[1].length() == 0) { | 137 } |
| 138 log.error("Incomplete SQ-relation row (missing a, b, Qmax or parameter): " | 138 if (a == null || b == null |
| 139 + line); | 139 || qMax == null || cols[1].length() == 0 |
| 140 } | 140 ) { |
| 141 return; | 141 log.error("Incomplete SQ-relation row (missing a, b, Qmax or parameter): " |
| 142 + line); | |
| 143 } | |
| 144 return; | |
| 142 } | 145 } |
| 143 current.addValue(new ImportSQRelationValue( | 146 current.addValue(new ImportSQRelationValue( |
| 144 cols[1], | 147 cols[1], |
| 145 km, | 148 km, |
| 146 a, | 149 a, |