Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/DeltaWTsKM.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 | 063b784b60b4 |
| children |
comparison
equal
deleted
inserted
replaced
| 2791:c9815016a3bb | 2792:fe987587ebc9 |
|---|---|
| 45 | 45 |
| 46 public void add(DeltaWT deltaWT) { | 46 public void add(DeltaWT deltaWT) { |
| 47 deltaWTs.add(deltaWT); | 47 deltaWTs.add(deltaWT); |
| 48 } | 48 } |
| 49 | 49 |
| 50 public int size() { | |
| 51 return deltaWTs.size(); | |
| 52 } | |
| 53 | |
| 50 @Override | 54 @Override |
| 51 public int compareTo(KM other) { | 55 public int compareTo(KM other) { |
| 52 double d = km - other.km; | 56 double d = km - other.km; |
| 53 if (d < -EPSILON) return -1; | 57 if (d < -EPSILON) return -1; |
| 54 if (d > EPSILON) return +1; | 58 if (d > EPSILON) return +1; |