Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/QRangeTree.java @ 2792:fe987587ebc9
Merged revisions 4539-4540,4543,4545-4546 via svnmerge from
file:///home/clients/bsh/bsh-generischer-viewer/Material/SVN/flys-artifacts/trunk
........
r4539 | teichmann | 2012-05-27 20:02:13 +0200 (So, 27 Mai 2012) | 1 line
FixA: Added forgotten csv/report facets/generators to conf.
........
r4540 | teichmann | 2012-05-27 20:11:31 +0200 (So, 27 Mai 2012) | 1 line
FixA: Fixed class cast bug in report facet.
........
r4543 | teichmann | 2012-05-28 20:35:01 +0200 (Mo, 28 Mai 2012) | 1 line
FixA: Added facet to return delta w/t as CSV
........
r4545 | teichmann | 2012-05-28 22:59:27 +0200 (Mo, 28 Mai 2012) | 1 line
FixA: Made Delta W/t calculation finally work
........
r4546 | teichmann | 2012-05-28 23:34:24 +0200 (Mo, 28 Mai 2012) | 1 line
FixA: corrected fitting (Q->W instead W->Q).
........
flys-artifacts/tags/2.7@4547 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Tue, 29 May 2012 04:58:29 +0000 |
parents | 49cfa5c66651 |
children | 5642a83420f2 |
comparison
equal
deleted
inserted
replaced
2791:c9815016a3bb | 2792:fe987587ebc9 |
---|---|
208 return parent; | 208 return parent; |
209 } | 209 } |
210 | 210 |
211 public double findQ(double pos) { | 211 public double findQ(double pos) { |
212 return root != null ? root.findQ(pos) : Double.NaN; | 212 return root != null ? root.findQ(pos) : Double.NaN; |
213 } | |
214 | |
215 @Override | |
216 public String toString() { | |
217 StringBuilder sb = new StringBuilder(); | |
218 inorder(root, sb); | |
219 return sb.toString(); | |
220 } | |
221 | |
222 protected static void inorder(Node node, StringBuilder sb) { | |
223 if (node != null) { | |
224 inorder(node.left, sb); | |
225 sb.append('[') | |
226 .append(node.a) | |
227 .append(", ") | |
228 .append(node.b) | |
229 .append(": ") | |
230 .append(node.q) | |
231 .append(']'); | |
232 inorder(node.right, sb); | |
233 } | |
213 } | 234 } |
214 | 235 |
215 private static final String name(Object o) { | 236 private static final String name(Object o) { |
216 return String.valueOf(System.identityHashCode(o) & 0xffffffffL); | 237 return String.valueOf(System.identityHashCode(o) & 0xffffffffL); |
217 } | 238 } |