Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/StaticWKmsArtifact.java @ 8860:28df64078f27
Merge with 0862ea5d66baf60e7eee496d130a35157cc9ec12
author | gernotbelger |
---|---|
date | Fri, 19 Jan 2018 11:23:42 +0100 |
parents | 5e38e2924c07 |
children | 3f49835a00c3 0a5239a1e46e |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/StaticWKmsArtifact.java Thu Jan 18 18:34:41 2018 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/StaticWKmsArtifact.java Fri Jan 19 11:23:42 2018 +0100 @@ -331,7 +331,13 @@ // Do linear interpolation. int mod = kmIncreasing ? -1 : +1; - return Linear.linear(km, wkms.getKm(idx+mod), wkms.getKm(idx), wkms.getW(idx+mod), wkms.getW(idx)); + return Linear.linear( + km, + wkms.getKm(idx+mod), + wkms.getKm(idx), + wkms.getW(idx+mod), + wkms.getW(idx) + ); } @@ -345,9 +351,15 @@ * @param next the next available input km (-1 if unavailable). * @param prev the previous available input km (-1 if unavailable). * - * @return W in wkms that is closer to km than to next and prev, or Double.NaN. + * @return W in wkms that is closer to km than to next and prev, + * or Double.NaN. */ - public double getWAtCloseKm(WKms wkms, double km, double next, double prev) { + public double getWAtCloseKm( + WKms wkms, + double km, + double next, + double prev + ) { // TODO symbolic "-1" pr next/prev is a bad idea (tm), as we compare // distances to these values later. // TODO issue888