flo-mat 3.0.10 → 3.0.11

package/src/debug/functions/two-prong.ts

@@ -11,16 +11,16 @@
 
 // /** @internal */
 // interface ITwoProngDebugFunctions {
-// 	logδ       : (n: number, type?: ElemType_TwoProng) => void,
-// 	log        : (n: number, type?: ElemType_TwoProng) => void,
-// 	drawNormal : typeof drawNormal,
-// 	logδBasic  : (n: number) => void,
-// 	logNearest : (
-// 		showSpokes?     : boolean,
-// 		showTrace?      : boolean,
-// 		showBoundaries? : boolean
-// 	) => (g: SVGGElement, p: number[], showDelay?: number, scale?: number) => void,
-// 	traceConvergence: typeof traceConvergence,
+//     logδ       : (n: number, type?: ElemType_TwoProng) => void,
+//     log        : (n: number, type?: ElemType_TwoProng) => void,
+//     drawNormal : typeof drawNormal,
+//     logδBasic  : (n: number) => void,
+//     logNearest : (
+//         showSpokes?     : boolean,
+//         showTrace?      : boolean,
+//         showBoundaries? : boolean
+//     ) => (g: SVGGElement, p: number[], showDelay?: number, scale?: number) => void,
+//     traceConvergence: typeof traceConvergence,
 // }
 
 
@@ -28,9 +28,9 @@
 //  * @internal
 //  */
 // function logδ(n: number, type: ElemType_TwoProng = 'twoProng_regular') {
-// 	const δ =_debug_.generated.elems[type][n].δ;
-	
-// 	console.log(δ);
+//     const δ =_debug_.generated.elems[type][n].δ;
+    
+//     console.log(δ);
 // }
 
 
@@ -38,8 +38,8 @@
 //  * @internal
 //  */
 // function log(n: number, type: ElemType_TwoProng = 'twoProng_regular') {
-// 	const twoProng = _debug_.generated.elems[type][n];
-// 	console.log(twoProng);
+//     const twoProng = _debug_.generated.elems[type][n];
+//     console.log(twoProng);
 // }
 
 
@@ -47,13 +47,13 @@
 //  * @internal
 //  */
 // function drawNormal(
-// 		g: SVGGElement,
-// 		twoProng: TwoProngForDebugging, 
-// 		showDelay = 1000) {
+//         g: SVGGElement,
+//         twoProng: TwoProngForDebugging, 
+//         showDelay = 1000) {
 
-// 	drawFs.line(
-// 		g, [twoProng.pos.p, twoProng.circle.center], 'thin10 blue', showDelay
-// 	);
+//     drawFs.line(
+//         g, [twoProng.pos.p, twoProng.circle.center], 'thin10 blue', showDelay
+//     );
 // }
 
 
@@ -61,21 +61,21 @@
 //  * @internal
 //  */
 // function logδBasic(
-// 		n: number, 
-// 		type: ElemType_TwoProng = 'twoProng_regular') {
-
-// 	const delta = _debug_.generated.elems[type][n].δ;
-
-// 	function logδBasic_(x: CpNode) {
-// 		const pos = x.cp.pointOnShape;
-// 		return {
-// 			bez: pos.curve.ps,
-// 			t: pos.t
-// 		}
-// 	}
-	
-// 	console.log(logδBasic_(delta[0]));
-// 	console.log(logδBasic_(delta[1]));
+//         n: number, 
+//         type: ElemType_TwoProng = 'twoProng_regular') {
+
+//     const delta = _debug_.generated.elems[type][n].δ;
+
+//     function logδBasic_(x: CpNode) {
+//         const pos = x.cp.pointOnShape;
+//         return {
+//             bez: pos.curve.ps,
+//             t: pos.t
+//         }
+//     }
+    
+//     console.log(logδBasic_(delta[0]));
+//     console.log(logδBasic_(delta[1]));
 // }
 
 
@@ -89,10 +89,10 @@
 //         twoProng: TwoProngForDebugging,
 //         showDelay = 1000): void {
 
-// 	const cc = twoProng.circle.center;
-// 	const { pos, circle, cpNode, xs, z, δ } = twoProng;
+//     const cc = twoProng.circle.center;
+//     const { pos, circle, cpNode, xs, z, δ } = twoProng;
     
-// 	drawFs.line(g, [pos.p, cc], 'thin5 red', showDelay);
+//     drawFs.line(g, [pos.p, cc], 'thin5 red', showDelay);
 //     drawFs.line(g, [z, cc], 'thin5 red', showDelay);
 // }
 
@@ -102,46 +102,46 @@
 //  */
 // function logNearest(
 //         showSpokes?: boolean,
-// 		showTrace?: boolean,
-// 		showBoundaries?: boolean) {
+//         showTrace?: boolean,
+//         showBoundaries?: boolean) {
             
 //     return (g: SVGGElement,
-// 			p: number[],
-// 			showDelay = 1000,
-// 			scale = 1) => {
-				
-// 		const closestPerLoops: TwoProngForDebugging[] = [];
-
-// 		const generated = _debug_.generated;
-// 		const twoProng = getObjClosestTo<TwoProngForDebugging>(
-// 			p, 
-// 			// generated.elems[type], 
-// 			generated.elems['twoProng_regular'],
-// 			twoProng => twoProng.circle.center
-// 		)!;
-// 		closestPerLoops.push(twoProng!);
-
-// 		console.log(twoProng);
-		
-// 		let n;
-// 		//for (let i=0; i<_debug_.generated.elems[type].length; i++) {
-// 		//	const twoProng_ = _debug_.generated.elems[type][i];
-// 		for (let i=0; i<_debug_.generated.elems['twoProng_regular'].length; i++) {
-// 			const twoProng_ = _debug_.generated.elems['twoProng_regular'][i];
-// 			if (twoProng_ === twoProng) {
-// 				n = i;
-// 				break;
-// 			}
-// 		}
+//             p: number[],
+//             showDelay = 1000,
+//             scale = 1) => {
+                
+//         const closestPerLoops: TwoProngForDebugging[] = [];
+
+//         const generated = _debug_.generated;
+//         const twoProng = getObjClosestTo<TwoProngForDebugging>(
+//             p, 
+//             // generated.elems[type], 
+//             generated.elems['twoProng_regular'],
+//             twoProng => twoProng.circle.center
+//         )!;
+//         closestPerLoops.push(twoProng!);
+
+//         console.log(twoProng);
+        
+//         let n;
+//         //for (let i=0; i<_debug_.generated.elems[type].length; i++) {
+//         //    const twoProng_ = _debug_.generated.elems[type][i];
+//         for (let i=0; i<_debug_.generated.elems['twoProng_regular'].length; i++) {
+//             const twoProng_ = _debug_.generated.elems['twoProng_regular'][i];
+//             if (twoProng_ === twoProng) {
+//                 n = i;
+//                 break;
+//             }
+//         }
 
 //         if (showSpokes) {
 //             drawSpokes(g, twoProng, showDelay)
 //         }
-		
-// 		if (n !== undefined && showTrace) {
-// 			traceConvergence(g, twoProng, showDelay, scale);
-// 		}
-// 	}
+        
+//         if (n !== undefined && showTrace) {
+//             traceConvergence(g, twoProng, showDelay, scale);
+//         }
+//     }
 // }
 
 
@@ -151,53 +151,53 @@
 //  * @param range
 //  */
 // function traceConvergence(
-// 		g: SVGGElement, 
-// 		twoProng: TwoProngForDebugging, 
-// 		showDelay = 1000,
-// 		scale = 1) {
-
-// 	const xs = twoProng.xs;
-
-// 	console.log(twoProng);
-// 	console.log(
-// 		twoProng.xs.map(x => ({
-// 				x: x.x,
-// 				y: x.y,
-// 				z: x.z, 
-// 				d: x.z ? squaredDistanceBetween(x.y.p, x.z.p) : 0,
-// 				t: x.t,
-// 			})
-// 		)
-// 	);
+//         g: SVGGElement, 
+//         twoProng: TwoProngForDebugging, 
+//         showDelay = 1000,
+//         scale = 1) {
+
+//     const xs = twoProng.xs;
+
+//     console.log(twoProng);
+//     console.log(
+//         twoProng.xs.map(x => ({
+//                 x: x.x,
+//                 y: x.y,
+//                 z: x.z, 
+//                 d: x.z ? squaredDistanceBetween(x.y.p, x.z.p) : 0,
+//                 t: x.t,
+//             })
+//         )
+//     );
 
 //     console.log(xs.length)
-// 	for (let i=0; i<xs.length; i++) {
-// 		const x = twoProng.xs[i];
-
-// 		const circle = { center: x.x, radius: distanceBetween(x.x, x.y.p) };
-// 		drawFs.crossHair(g, x.x, 'red thin10 nofill', 0.002*scale, showDelay);
-// 		drawFs.circle(g, circle, 'blue thin10 nofill', showDelay);
-// 		if (x.z !== undefined) {
-// 			drawFs.crossHair(
-// 				g, x.z.p, 'yellow thin10 nofill', 0.001*scale, showDelay
-// 			);
-// 		}
-// 	}
-
-// 	// twoProngDebugFunctions.drawNormal(g, twoProng, showDelay);
+//     for (let i=0; i<xs.length; i++) {
+//         const x = twoProng.xs[i];
+
+//         const circle = { center: x.x, radius: distanceBetween(x.x, x.y.p) };
+//         drawFs.crossHair(g, x.x, 'red thin10 nofill', 0.002*scale, showDelay);
+//         drawFs.circle(g, circle, 'blue thin10 nofill', showDelay);
+//         if (x.z !== undefined) {
+//             drawFs.crossHair(
+//                 g, x.z.p, 'yellow thin10 nofill', 0.001*scale, showDelay
+//             );
+//         }
+//     }
+
+//     // twoProngDebugFunctions.drawNormal(g, twoProng, showDelay);
 // }
 
 
 // /** @internal */
 // const twoProngDebugFunctions: ITwoProngDebugFunctions = {
-// 	logδ,
-// 	log,
-// 	drawNormal,
-// 	logδBasic,
-// 	traceConvergence,
-// 	logNearest,	
+//     logδ,
+//     log,
+//     drawNormal,
+//     logδBasic,
+//     traceConvergence,
+//     logNearest,    
 // }
 
 
 // export { ITwoProngDebugFunctions, twoProngDebugFunctions };
-	
+    

package/src/find-2-prong/add-1-prong.ts

@@ -15,44 +15,44 @@ import { getPosCorner } from '../point-on-shape/get-pos-corner.js';
  * @param pos 
  */
 function add1Prong(
-		meta: MatMeta,
-		radius: number,
+        meta: MatMeta,
+        radius: number,
         center: number[],
         pos: PointOnShape) {
 
     if (isPosCorner(pos) && getPosCorner(pos).isDull) {
-		// This is a 1-prong at a dull corner.
-		
-		// TODO IMPORTANT 
-		// Remove this line, uncomment piece below it and implement the 
-		// following strategy to find the 3-prongs: if deltas are conjoined due 
-		// to dull corner, split the conjoinment by inserting successively 
-		// closer (binary division) 2-prongs. If a 2-prong actually fails, 
-		// simply remove the 1-prong at the dull corner. In this way **all** 
+        // This is a 1-prong at a dull corner.
+        
+        // TODO IMPORTANT 
+        // Remove this line, uncomment piece below it and implement the 
+        // following strategy to find the 3-prongs: if deltas are conjoined due 
+        // to dull corner, split the conjoinment by inserting successively 
+        // closer (binary division) 2-prongs. If a 2-prong actually fails, 
+        // simply remove the 1-prong at the dull corner. In this way **all** 
         // terminal points are found, e.g. zoom in on top left leg of ant.
         // Afterthought: there is a better way - split points by two prongs.
 
-		//toRemove.push(posNode); // this!
-		
-		// if (typeof _debug_ !== 'undefined') { 
+        //toRemove.push(posNode); // this!
+        
+        // if (typeof _debug_ !== 'undefined') { 
             // _debug_.generated.elems.oneProngAtDullCorner.push(pos);
         // }
 
-		return;
-	}
-	
+        return;
+    }
+    
     const circle: Circle = { radius, center };
-	
-	const order = calcPosOrder(circle, pos);
-	// Make sure there isn't already a ContactPoint close by - it can cause
-	// floating point stability issues.
-	if (getCloseByCpIfExist(meta, pos, circle, order, 0, 1)) {
-		return;
-	}
+    
+    const order = calcPosOrder(circle, pos);
+    // Make sure there isn't already a ContactPoint close by - it can cause
+    // floating point stability issues.
+    if (getCloseByCpIfExist(meta, pos, circle, order, 0, 1)) {
+        return;
+    }
 
     const { anyFailed, cpNodes } = addToCpTree(false, false, circle, [-0.5, +0.5], meta, [pos, pos]); 
-	
-	// if (typeof _debug_ !== 'undefined') { 
+    
+    // if (typeof _debug_ !== 'undefined') { 
     //     _debug_.generated.elems.oneProng.push(cpNodes);
     // }
 }