Mercurial > dive4elements > river

diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/Calculation4.java @ 8860:28df64078f27
Merge with 0862ea5d66baf60e7eee496d130a35157cc9ec12
author: gernotbelger
date: Fri, 19 Jan 2018 11:23:42 +0100
parents: 5e38e2924c07
children: 2b83d3a96703 0a5239a1e46e
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/Calculation4.java	Thu Jan 18 18:34:41 2018 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/Calculation4.java	Fri Jan 19 11:23:42 2018 +0100
@@ -168,7 +168,9 @@
                     s2 = segments.get(0);
                     Arrays.fill(functions, Identity.IDENTITY);
                 }
-                else if (pos >= segments.get(segments.size()-1).referencePoint) {
+                else if (
+                    pos >= segments.get(segments.size()-1).referencePoint
+                ) {
                     // after last segment -> "gleichwertig"
                     if (debug) {
                         log.debug("after last segment -> gleichwertig");
@@ -195,8 +197,9 @@
                         Segment si1 = segments.get(i-1);
                         Segment si  = segments.get(i);
                         if (debug) {
-                            log.debug("check " + pos + " in " +
-                                si1.referencePoint + " - " + si.referencePoint);
+                            log.debug("check " + pos + " in "
+                                + si1.referencePoint + " - "
+                                + si.referencePoint);
                         }
                         if (pos >= si1.referencePoint
                         &&  pos <= si. referencePoint) {