Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java @ 360:3571357c85a7
Bugfix: Removed endless loop and a bug while iterating over Hibernate results.
flys-artifacts/trunk@1768 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Fri, 29 Apr 2011 07:22:25 +0000 |
parents | 79401797f4e1 |
children | fc3cf0ef777e |
comparison
equal
deleted
inserted
replaced
359:e5ea6a01526c | 360:3571357c85a7 |
---|---|
158 } | 158 } |
159 | 159 |
160 public double interpolateW(double q) { | 160 public double interpolateW(double q) { |
161 if (Double.isNaN(q)) return Double.NaN; | 161 if (Double.isNaN(q)) return Double.NaN; |
162 int index = getQIndex(q); | 162 int index = getQIndex(q); |
163 return index >= 0 ? ws[index] : interpolateW(-index -1); | 163 return index >= 0 ? ws[index] : interpolateW(-index -1, q); |
164 } | 164 } |
165 | 165 |
166 public int getQIndex(double q) { | 166 public int getQIndex(double q) { |
167 return qSorted ? binaryQIndex(q) : linearQIndex(q); | 167 return qSorted ? binaryQIndex(q) : linearQIndex(q); |
168 } | 168 } |
460 Row row = null; | 460 Row row = null; |
461 | 461 |
462 Double lastQ = -Double.MAX_VALUE; | 462 Double lastQ = -Double.MAX_VALUE; |
463 boolean qSorted = true; | 463 boolean qSorted = true; |
464 | 464 |
465 for (Iterator<Object []> iter = sqlQuery.iterate(); iter.hasNext();) { | 465 for (Object r: sqlQuery.list()) { |
466 Object [] result = iter.next(); | 466 Object[] result = (Object[]) r; |
467 | |
467 double km = (Double) result[0]; | 468 double km = (Double) result[0]; |
468 Double w = (Double) result[1]; | 469 Double w = (Double) result[1]; |
469 Double q = (Double) result[2]; | 470 Double q = (Double) result[2]; |
470 int columnNo = (Integer)result[3]; | 471 int columnNo = (Integer)result[3]; |
471 | 472 |