robust-predicates 2.0.2 → 3.0.1

package/esm/orient2d.js

@@ -1,7 +1,4 @@
-import {
-    epsilon, splitter, resulterrbound, estimate, vec,
-    fast_expansion_sum_zeroelim
-} from './util.js';
+import {epsilon, splitter, resulterrbound, estimate, vec, sum} from './util.js';
 
 const ccwerrboundA = (3 + 16 * epsilon) * epsilon;
 const ccwerrboundB = (2 + 12 * epsilon) * epsilon;
@@ -15,49 +12,48 @@ const u = vec(4);
 
 function orient2dadapt(ax, ay, bx, by, cx, cy, detsum) {
     let acxtail, acytail, bcxtail, bcytail;
-    let detleft, detright, detlefttail, detrighttail;
-    let B3, u3, s1, t1, s0, t0;
-    let bvirt, c, ahi, alo, bhi, blo, _i, _j, _0;
+    let bvirt, c, ahi, alo, bhi, blo, _i, _j, _0, s1, s0, t1, t0, u3;
 
     const acx = ax - cx;
     const bcx = bx - cx;
     const acy = ay - cy;
     const bcy = by - cy;
 
-    detleft = acx * bcy;
+    s1 = acx * bcy;
     c = splitter * acx;
     ahi = c - (c - acx);
     alo = acx - ahi;
     c = splitter * bcy;
     bhi = c - (c - bcy);
     blo = bcy - bhi;
-    detlefttail = alo * blo - (detleft - ahi * bhi - alo * bhi - ahi * blo);
-    detright = acy * bcx;
+    s0 = alo * blo - (s1 - ahi * bhi - alo * bhi - ahi * blo);
+    t1 = acy * bcx;
     c = splitter * acy;
     ahi = c - (c - acy);
     alo = acy - ahi;
     c = splitter * bcx;
     bhi = c - (c - bcx);
     blo = bcx - bhi;
-    detrighttail = alo * blo - (detright - ahi * bhi - alo * bhi - ahi * blo);
-
-    _i = detlefttail - detrighttail;
-    bvirt = detlefttail - _i;
-    B[0] = detlefttail - (_i + bvirt) + (bvirt - detrighttail);
-    _j = detleft + _i;
-    bvirt = _j - detleft;
-    _0 = detleft - (_j - bvirt) + (_i - bvirt);
-    _i = _0 - detright;
+    t0 = alo * blo - (t1 - ahi * bhi - alo * bhi - ahi * blo);
+    _i = s0 - t0;
+    bvirt = s0 - _i;
+    B[0] = s0 - (_i + bvirt) + (bvirt - t0);
+    _j = s1 + _i;
+    bvirt = _j - s1;
+    _0 = s1 - (_j - bvirt) + (_i - bvirt);
+    _i = _0 - t1;
     bvirt = _0 - _i;
-    B[1] = _0 - (_i + bvirt) + (bvirt - detright);
-    B3 = _j + _i;
-    bvirt = B3 - _j;
-    B[2] = _j - (B3 - bvirt) + (_i - bvirt);
-    B[3] = B3;
+    B[1] = _0 - (_i + bvirt) + (bvirt - t1);
+    u3 = _j + _i;
+    bvirt = u3 - _j;
+    B[2] = _j - (u3 - bvirt) + (_i - bvirt);
+    B[3] = u3;
 
     let det = estimate(4, B);
     let errbound = ccwerrboundB * detsum;
-    if (det >= errbound || -det >= errbound) return det;
+    if (det >= errbound || -det >= errbound) {
+        return det;
+    }
 
     bvirt = ax - acx;
     acxtail = ax - (acx + bvirt) + (bvirt - cx);
@@ -68,13 +64,13 @@ function orient2dadapt(ax, ay, bx, by, cx, cy, detsum) {
     bvirt = by - bcy;
     bcytail = by - (bcy + bvirt) + (bvirt - cy);
 
-    if (acxtail === 0 && acytail === 0 && bcxtail === 0 && bcytail === 0) return det;
+    if (acxtail === 0 && acytail === 0 && bcxtail === 0 && bcytail === 0) {
+        return det;
+    }
 
     errbound = ccwerrboundC * detsum + resulterrbound * Math.abs(det);
     det += (acx * bcytail + bcy * acxtail) - (acy * bcxtail + bcx * acytail);
-    if (det >= errbound || -det >= errbound) {
-        return det;
-    }
+    if (det >= errbound || -det >= errbound) return det;
 
     s1 = acxtail * bcy;
     c = splitter * acxtail;
@@ -105,7 +101,7 @@ function orient2dadapt(ax, ay, bx, by, cx, cy, detsum) {
     bvirt = u3 - _j;
     u[2] = _j - (u3 - bvirt) + (_i - bvirt);
     u[3] = u3;
-    const C1length = fast_expansion_sum_zeroelim(4, B, 4, u, C1);
+    const C1len = sum(4, B, 4, u, C1);
 
     s1 = acx * bcytail;
     c = splitter * acx;
@@ -136,7 +132,7 @@ function orient2dadapt(ax, ay, bx, by, cx, cy, detsum) {
     bvirt = u3 - _j;
     u[2] = _j - (u3 - bvirt) + (_i - bvirt);
     u[3] = u3;
-    const C2length = fast_expansion_sum_zeroelim(C1length, C1, 4, u, C2);
+    const C2len = sum(C1len, C1, 4, u, C2);
 
     s1 = acxtail * bcytail;
     c = splitter * acxtail;
@@ -167,37 +163,20 @@ function orient2dadapt(ax, ay, bx, by, cx, cy, detsum) {
     bvirt = u3 - _j;
     u[2] = _j - (u3 - bvirt) + (_i - bvirt);
     u[3] = u3;
-    const Dlength = fast_expansion_sum_zeroelim(C2length, C2, 4, u, D);
+    const Dlen = sum(C2len, C2, 4, u, D);
 
-    return D[Dlength - 1];
+    return D[Dlen - 1];
 }
 
 export function orient2d(ax, ay, bx, by, cx, cy) {
     const detleft = (ay - cy) * (bx - cx);
     const detright = (ax - cx) * (by - cy);
     const det = detleft - detright;
-    let detsum;
-
-    if (detleft > 0) {
-        if (detright <= 0) {
-            return det;
-        }
-        detsum = detleft + detright;
 
-    } else if (detleft < 0) {
-        if (detright >= 0) {
-            return det;
-        }
-        detsum = -detleft - detright;
+    if (detleft === 0 || detright === 0 || (detleft > 0) !== (detright > 0)) return det;
 
-    } else {
-        return det;
-    }
-
-    const errbound = ccwerrboundA * detsum;
-    if (det >= errbound || -det >= errbound) {
-        return det;
-    }
+    const detsum = Math.abs(detleft + detright);
+    if (Math.abs(det) >= ccwerrboundA * detsum) return det;
 
     return -orient2dadapt(ax, ay, bx, by, cx, cy, detsum);
 }