Mercurial > dive4elements > river
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 8854:7bbfb24e6eec | 8860:28df64078f27 |
|---|---|
| 166 sentinel.setReferencePoint(-Double.MAX_VALUE); | 166 sentinel.setReferencePoint(-Double.MAX_VALUE); |
| 167 s1 = sentinel; | 167 s1 = sentinel; |
| 168 s2 = segments.get(0); | 168 s2 = segments.get(0); |
| 169 Arrays.fill(functions, Identity.IDENTITY); | 169 Arrays.fill(functions, Identity.IDENTITY); |
| 170 } | 170 } |
| 171 else if (pos >= segments.get(segments.size()-1).referencePoint) { | 171 else if ( |
| 172 pos >= segments.get(segments.size()-1).referencePoint | |
| 173 ) { | |
| 172 // after last segment -> "gleichwertig" | 174 // after last segment -> "gleichwertig" |
| 173 if (debug) { | 175 if (debug) { |
| 174 log.debug("after last segment -> gleichwertig"); | 176 log.debug("after last segment -> gleichwertig"); |
| 175 } | 177 } |
| 176 Segment last = segments.get(segments.size()-1); | 178 Segment last = segments.get(segments.size()-1); |
| 193 s1 = s2 = null; | 195 s1 = s2 = null; |
| 194 for (int i = 1, N = segments.size(); i < N; ++i) { | 196 for (int i = 1, N = segments.size(); i < N; ++i) { |
| 195 Segment si1 = segments.get(i-1); | 197 Segment si1 = segments.get(i-1); |
| 196 Segment si = segments.get(i); | 198 Segment si = segments.get(i); |
| 197 if (debug) { | 199 if (debug) { |
| 198 log.debug("check " + pos + " in " + | 200 log.debug("check " + pos + " in " |
| 199 si1.referencePoint + " - " + si.referencePoint); | 201 + si1.referencePoint + " - " |
| 202 + si.referencePoint); | |
| 200 } | 203 } |
| 201 if (pos >= si1.referencePoint | 204 if (pos >= si1.referencePoint |
| 202 && pos <= si. referencePoint) { | 205 && pos <= si. referencePoint) { |
| 203 s1 = si1; | 206 s1 = si1; |
| 204 s2 = si; | 207 s2 = si; |