Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java @ 3107:cbf308f5c41b
FixA: Store the standard deviation of delta Ws of reference points into parameters, too.
flys-artifacts/trunk@4706 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Tue, 19 Jun 2012 15:28:40 +0000 |
| parents | 23de6d678fba |
| children | 0b86b005bb9a |
comparison
equal
deleted
inserted
replaced
| 3106:23de6d678fba | 3107:cbf308f5c41b |
|---|---|
| 209 KMIndex<QWD []> referenced = new KMIndex<QWD []>(kms.length); | 209 KMIndex<QWD []> referenced = new KMIndex<QWD []>(kms.length); |
| 210 | 210 |
| 211 int kmIndex = results.columnIndex("km"); | 211 int kmIndex = results.columnIndex("km"); |
| 212 int chiSqrIndex = results.columnIndex("chi_sqr"); | 212 int chiSqrIndex = results.columnIndex("chi_sqr"); |
| 213 int maxQIndex = results.columnIndex("max_q"); | 213 int maxQIndex = results.columnIndex("max_q"); |
| 214 int stdDevIndex = results.columnIndex("std-dev"); | |
| 214 int [] parameterIndices = results.columnIndices(parameterNames); | 215 int [] parameterIndices = results.columnIndices(parameterNames); |
| 215 | 216 |
| 216 int numFailed = 0; | 217 int numFailed = 0; |
| 217 | 218 |
| 218 for (int i = 0; i < kms.length; ++i) { | 219 for (int i = 0; i < kms.length; ++i) { |
| 241 | 242 |
| 242 int row = results.newRow(); | 243 int row = results.newRow(); |
| 243 | 244 |
| 244 results.set(row, kmIndex, km); | 245 results.set(row, kmIndex, km); |
| 245 results.set(row, chiSqrIndex, fitting.getChiSquare()); | 246 results.set(row, chiSqrIndex, fitting.getChiSquare()); |
| 246 results.set(row, maxQIndex, fitting.getMaxQ()); | 247 results.set(row, stdDevIndex, fitting.getStandardDeviation()); |
| 248 results.set(row, maxQIndex, fitting.getMaxQ()); | |
| 247 invalid |= results.set( | 249 invalid |= results.set( |
| 248 row, parameterIndices, fitting.getParameters()); | 250 row, parameterIndices, fitting.getParameters()); |
| 249 } | 251 } |
| 250 | 252 |
| 251 if (debug) { | 253 if (debug) { |
| 576 | 578 |
| 577 return columns; | 579 return columns; |
| 578 } | 580 } |
| 579 | 581 |
| 580 protected static String [] createColumnNames(String [] parameters) { | 582 protected static String [] createColumnNames(String [] parameters) { |
| 581 String [] result = new String[parameters.length + 3]; | 583 String [] result = new String[parameters.length + 4]; |
| 582 result[0] = "km"; | 584 result[0] = "km"; |
| 583 result[1] = "chi_sqr"; | 585 result[1] = "chi_sqr"; |
| 584 result[2] = "max_q"; | 586 result[2] = "max_q"; |
| 585 System.arraycopy(parameters, 0, result, 3, parameters.length); | 587 result[3] = "std-dev"; |
| 588 System.arraycopy(parameters, 0, result, 4, parameters.length); | |
| 586 return result; | 589 return result; |
| 587 } | 590 } |
| 588 } | 591 } |
| 589 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : | 592 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : |