Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Parameters.java @ 3057:febc39e77672
Make it compilable again
flys-artifacts/trunk@4633 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Mon, 11 Jun 2012 09:58:54 +0000 |
parents | 0b5a7a2c3724 |
children | 4f7171ac6153 |
comparison
equal
deleted
inserted
replaced
3056:0b5a7a2c3724 | 3057:febc39e77672 |
---|---|
32 for (int i = 0; i < columnNames.length; ++i) { | 32 for (int i = 0; i < columnNames.length; ++i) { |
33 if (columnNames[i].equals(name)) { | 33 if (columnNames[i].equals(name)) { |
34 return i; | 34 return i; |
35 } | 35 } |
36 } | 36 } |
37 log.debug("columnIndex: " + name + " not found in columnNames"); | 37 if (log.isDebugEnabled()) { |
38 log.debug("columnIndex: " + name + " not found in columnNames"); | |
39 } | |
38 return -1; | 40 return -1; |
39 } | 41 } |
40 | 42 |
41 public int newRow() { | 43 public int newRow() { |
42 | 44 |
135 public int binarySearch(String columnName, double value, double epsilon) { | 137 public int binarySearch(String columnName, double value, double epsilon) { |
136 return binarySearch(columnIndex(columnName), value, epsilon); | 138 return binarySearch(columnIndex(columnName), value, epsilon); |
137 } | 139 } |
138 | 140 |
139 public int binarySearch(int columnIndex, double value, double epsilon) { | 141 public int binarySearch(int columnIndex, double value, double epsilon) { |
140 if (epsilon < 0d) | 142 if (epsilon < 0d) epsilon = -epsilon; |
141 epsilon = -epsilon; | |
142 double vl = value - epsilon; | 143 double vl = value - epsilon; |
143 double vh = value + epsilon; | 144 double vh = value + epsilon; |
144 | 145 |
145 TDoubleArrayList column = columns[columnIndex]; | 146 TDoubleArrayList column = columns[columnIndex]; |
146 int lo = 0, hi = column.size()-1; | 147 int lo = 0, hi = column.size()-1; |
147 while (hi >= lo) { | 148 while (hi >= lo) { |
148 int mid = (lo + hi) >> 1; | 149 int mid = (lo + hi) >> 1; |
149 double v = column.getQuick(mid); | 150 double v = column.getQuick(mid); |
150 if (v < vl) | 151 if (v < vl) hi = mid - 1; |
151 hi = mid - 1; | 152 else if (v > vh) lo = mid + 1; |
152 else if (v > vh) | 153 else return mid; |
153 lo = mid + 1; | |
154 else | |
155 return mid; | |
156 } | 154 } |
157 | 155 |
158 return -1; | 156 return -1; |
159 } | 157 } |
160 | 158 |