flo-mat 4.1.4 → 4.1.5

package/__tests__/cp-node/circle-identity.spec.ts

@@ -0,0 +1,56 @@
+import { expect, test } from '@jest/globals';
+import type { CpNode } from '../../src/cp-node/cp-node.js';
+import type { Circle } from '../../src/geometry/circle.js';
+import { getPathsFromStr } from 'flo-boolean';
+import { findMats } from '../../src/find-mat/find-mats.js';
+import { getAllOnCircle } from '../../src/cp-node/fs/get-all-on-circle.js';
+import { getAllOnLoop_ByLoop } from '../../src/cp-node/fs/get-all-on-loop-by-loop.js';
+import { toStringifyable } from '../../src/cp-node/stringification/to-stringifyable.js';
+import { fromStringifyable } from '../../src/cp-node/stringification/from-stringifyable.js';
+
+
+/**
+ * Checks the `PointOnShape.circle` invariant: one `Circle` object per
+ * on-circle ring, shared by all of the ring's `CpNode`s and by no other ring.
+ */
+function checkCircleIdentity(cpStart: CpNode): void {
+    const cpNodes = getAllOnLoop_ByLoop(cpStart).flat();
+
+    const ringOfCircle = new Map<Circle, CpNode[]>();
+    const seen = new Set<CpNode>();
+    for (const cpNode of cpNodes) {
+        if (seen.has(cpNode)) { continue; }
+
+        const ring = getAllOnCircle(cpNode);
+        const { circle } = cpNode.pointOnShape;
+        for (const cp of ring) {
+            seen.add(cp);
+            // shared by all of the ring's CpNodes
+            expect(cp.pointOnShape.circle).toBe(circle);
+        }
+
+        // ...and by no other ring
+        expect(ringOfCircle.has(circle)).toBe(false);
+        ringOfCircle.set(circle, ring);
+    }
+}
+
+
+test('one `Circle` object per on-circle ring (incl. hole closers)', function() {
+    // a square with a square hole - forces hole-closing 2-prongs
+    const loops = getPathsFromStr(
+        'M0 0 L100 0 L100 100 L0 100 Z ' +
+        'M30 30 L30 70 L70 70 L70 30 Z'
+    );
+    const { cpNode } = findMats(loops, {})[0];
+
+    // the test is only meaningful if hole closers were actually created
+    const cpNodes = getAllOnLoop_ByLoop(cpNode).flat();
+    expect(cpNodes.some(cp => cp.holeCloserTwin !== undefined)).toBe(true);
+
+    checkCircleIdentity(cpNode);
+
+    // ...and the invariant survives a (JSON) stringification round trip
+    const json = JSON.stringify(toStringifyable(cpNode));
+    checkCircleIdentity(fromStringifyable(JSON.parse(json)));
+});

package/__tests__/find-2-prong/get-medial/dd-get-medial-point-coeffs-same-curve.spec.ts

@@ -5,6 +5,8 @@ import { ddGetMedialPointCoeffsBez2_SameCurve } from '../../../src/get-medial-po
 import { ddGetMedialPointCoeffsBez3_SameCurve } from '../../../src/get-medial-points/double-double/dd-get-medial-point-coeffs-bez3-same-curve.js';
 import { ddNormal } from 'flo-bezier3';
 
+const { abs, floor } = Math;
+
 
 function toDdVec(v: number[]): number[][] {
     return v.map(x => [0, x]);
@@ -17,7 +19,7 @@ function ddPolyToDouble(poly: number[][]): number[] {
 function normalizedPoly(poly: number[]): number[] {
     let m = 0;
     for (const x of poly) {
-        const ax = Math.abs(x);
+        const ax = abs(x);
         if (ax > m) { m = ax; }
     }
 
@@ -34,8 +36,8 @@ function randomNumberIn01(seed: number): number {
 
 function randomSignedValue(seed: number): number {
     const sign = randomNumberIn01(seed) < 0.5 ? -1 : 1;
-    const exponent = Math.floor(randomNumberIn01(seed + 1) * 61) - 30;
-    const mantissa = 1 + Math.floor(randomNumberIn01(seed + 2) * 2**20);
+    const exponent = floor(randomNumberIn01(seed + 1) * 61) - 30;
+    const mantissa = 1 + floor(randomNumberIn01(seed + 2) * 2**20);
 
     return sign * mantissa * 2**exponent;
 }
@@ -67,7 +69,7 @@ test.skip('dd same-curve coefficients match flo-bezier3 double coefficients', fu
 
         const n2Dd = ddNormal(ps2, t);
         let v2 = [n2Dd[0][1], n2Dd[1][1]];
-        if (Math.abs(v2[0]) + Math.abs(v2[1]) < 2**-20) {
+        if (abs(v2[0]) + abs(v2[1]) < 2**-20) {
             v2 = [v2[0] + 1, v2[1] - 1];
         }
         const v2Dd = toDdVec(v2);
@@ -89,7 +91,7 @@ test.skip('dd same-curve coefficients match flo-bezier3 double coefficients', fu
 
         const n3Dd = ddNormal(ps3, t);
         let v3 = [n3Dd[0][1], n3Dd[1][1]];
-        if (Math.abs(v3[0]) + Math.abs(v3[1]) < 2**-20) {
+        if (abs(v3[0]) + abs(v3[1]) < 2**-20) {
             v3 = [v3[0] + 1, v3[1] - 1];
         }
         const v3Dd = toDdVec(v3);

package/__tests__/find-2-prong/get-medial/dd-get-medial-point-coeffs.spec.ts

@@ -3,6 +3,8 @@ import { getMedialPointCoeffs } from 'flo-bezier3';
 import { ddGetMedialPointCoeffs } from '../../../src/get-medial-points/double-double/dd-get-medial-point-coeffs.js';
 import { squares } from 'squares-rng';
 
+const { floor, abs } = Math;
+
 
 function toDdVec(v: number[]): number[][] {
     return v.map(x => [0, x]);
@@ -19,7 +21,7 @@ function randomNumberIn01(seed: number): number {
 
 function randomSignedValue(seed: number): number {
     const sign = randomNumberIn01(seed) < 0.5 ? -1 : 1;
-    const exponent = Math.floor(randomNumberIn01(seed + 1) * 81) - 40;
+    const exponent = floor(randomNumberIn01(seed + 1) * 81) - 40;
     const mantissa = 1 + randomNumberIn01(seed + 2);
 
     return sign * mantissa * 2**exponent;
@@ -46,7 +48,7 @@ test('ddGetMedialPointCoeffs matches flo-bezier3 double coefficients', function(
             let v = randomPoint(seed); seed += 11;
 
             // Keep the direction away from near-zero vectors.
-            if (Math.abs(v[0]) + Math.abs(v[1]) < 2**-20) {
+            if (abs(v[0]) + abs(v[1]) < 2**-20) {
                 v = [v[0] + 1, v[1] - 1];
             }