Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/WQKms.java @ 8860:28df64078f27
Merge with 0862ea5d66baf60e7eee496d130a35157cc9ec12
author | gernotbelger |
---|---|
date | Fri, 19 Jan 2018 11:23:42 +0100 |
parents | 5e38e2924c07 |
children | 0a5239a1e46e |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WQKms.java Thu Jan 18 18:34:41 2018 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WQKms.java Fri Jan 19 11:23:42 2018 +0100 @@ -61,7 +61,12 @@ this(kms, wq.getQs(), wq.getWs(), wq.getName()); } - public WQKms(TDoubleArrayList kms, TDoubleArrayList qs, TDoubleArrayList ws, String name) { + public WQKms( + TDoubleArrayList kms, + TDoubleArrayList qs, + TDoubleArrayList ws, + String name + ) { super(qs, ws, name); this.kms = kms; } @@ -75,7 +80,8 @@ public static WQKms fromWKms(WKms wkms, double q) { TDoubleArrayList qs = new TDoubleArrayList(wkms.allKms().size()); qs.fill(q); - WQKms wqkms = new WQKms(wkms.allKms(), qs, wkms.allWs(), wkms.getName()); + WQKms wqkms = + new WQKms(wkms.allKms(), qs, wkms.allWs(), wkms.getName()); return wqkms; } @@ -184,7 +190,9 @@ double b = getKm(s-1); double c = getKm(s/2); - return Math.abs(a-b) > EPS || Math.abs(a-c) > EPS || Math.abs(b-c) > EPS + return Math.abs(a-b) > EPS + || Math.abs(a-c) > EPS + || Math.abs(b-c) > EPS ? null : a; }