flo-mat 3.0.15 → 4.0.1

package/src/debug/functions/draw-elem/draw-max-vertex.ts

@@ -1,10 +1,10 @@
+import type { CpNode } from '../../../cp-node/cp-node.js';
 import { drawFs } from 'flo-draw';
-import { CpNode } from '../../../cp-node/cp-node.js';
 
 
 /** @internal */
-function maxVertex(g: SVGGElement, cpNode: CpNode) {    
-    const circle = cpNode.cp.circle;
+function maxVertex(g: SVGGElement, cpNode: CpNode) {
+    const circle = cpNode.pointOnShape.circle;
 
     const $elems = drawFs.circle(g, circle, 'brown thin10 nofill');
         

package/src/debug/functions/draw-elem/draw-one-prong-at-dull-corner.ts

@@ -1,7 +1,8 @@
-
+import type { Circle } from '../../../geometry/circle.js';
 import { drawFs } from 'flo-draw';
 import { PointOnShape } from '../../../point-on-shape/point-on-shape.js';
 import { getOsculatingCircle } from '../../../point-on-shape/get-osculating-circle.js';
+import { ddCurvature, ddNormal, ddTangent } from 'flo-bezier3';
 
 
 /** @hidden */
@@ -12,8 +13,21 @@ function oneProngAtDullCorner(
         delay = 1000,
         scaleFactor = 1) {
 
-    //let oCircle = PointOnShape.getOsculatingCircle(Number.POSITIVE_INFINITY, pos);
-    const oCircle = getOsculatingCircle(Number.POSITIVE_INFINITY, pos);
+    //let oCircle = PointOnShape.getOsculatingCircle(Infinity, pos);
+    const { curve, p, t } = pos;
+    const { ps } = curve;
+
+    const norm = ddNormal(ps, t).map(c => c[1]);
+    // const [center,r] = getOsculatingCircle(Infinity, pos, norm);
+
+    const k = -(ddCurvature(ps, t)[1]);
+
+    const [tx, ty] = norm;
+    const l = Math.sqrt(tx*tx + ty*ty);
+    const scale = k*l;
+    const center = [p[0] - tx/scale, p[1] - ty/scale];
+
+    const oCircle: Circle = { center, radius: 1/k };
 
     const $center = drawFs.dot(g, pos.p, 0.1, 'orange');
     const $circle = drawFs.dot(g, oCircle.center, 0.25, 'orange');

package/src/debug/functions/draw-elem/draw-one-prong.ts

@@ -1,22 +1,24 @@
+import type { CpNode } from '../../../cp-node/cp-node.js';
 import { drawFs } from 'flo-draw';
-import { CpNode } from '../../../cp-node/cp-node.js';
 
 
 /** @hidden */
 function drawOneProng(
         g: SVGGElement,
-        cpNodes: CpNode[],
+        cpNode: CpNode,
         classes?: string,
         delay = 0,
         scaleFactor = 1) {
 
-    const cp = cpNodes[0].cp;
-    const { circle, pointOnShape: pos } = cp;
-    const $center = drawFs.dot(g, pos.p, 0.02*scaleFactor, 'deeppink', delay);
-    const $circle = drawFs.dot(g, circle.center, 0.05*scaleFactor, 'deeppink', delay);
-    const $pos    = drawFs.circle(g, circle, 'deeppink thin5 nofill', delay);
+    // const cp = cpNode.cp;
+    const { pointOnShape: pos } = cpNode;
+    const { circle } = pos;
 
-    return [...$center, ...$circle, ...$pos];
+    const $posP = drawFs.dot(g, pos.p, 0.02*scaleFactor, 'deeppink', delay);
+    const $circleCenter = drawFs.dot(g, circle.center, 0.01*scaleFactor, 'deeppink', delay);
+    const $circle = drawFs.circle(g, circle, 'deeppink thin5 nofill', delay);
+
+    return [...$posP, ...$circleCenter, ...$circle];
 }
 
 

package/src/debug/functions/draw-elem/draw-three-prong.ts

@@ -14,14 +14,14 @@ function drawThreeProng(
         scaleFactor = 1) {
 
     const circle = scaleCircle(
-        threeProng.cp.circle,
+        threeProng.pointOnShape.circle,
         1
     );
     const { center: c, radius: r } = circle;
     
     // const poss = threeProng.poss;
     const poss = CpNodeFs.getAllOnCircle(threeProng)
-        .map(cpNode => cpNode.cp.pointOnShape)
+        .map(cpNode => cpNode.pointOnShape)
 
     const { dot, circle: drawCircle, crossHair } = drawFs;
 

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

@@ -29,11 +29,12 @@ function drawTwoProng(
             }        
         }
 
-        const cp = twoProng.cp;
-        const { circle, pointOnShape: pos } = cp;
+        // const cp = twoProng.cp;
+        const { pointOnShape: pos } = twoProng;
+        const { circle } = pos;
         const { center: c, radius: r } = circle;
         const { isSource, p } = pos;
-        const p2 = twoProng.nextOnCircle.cp.pointOnShape.p;
+        const p2 = twoProng.nextOnCircle.pointOnShape.p;
         const pS = isSource ? p : p2;
         const pA = isSource ? p2 : p;
         

package/src/debug/functions/draw-elem/draw-vertex.ts

@@ -13,7 +13,7 @@ function vertex(
         delay = 0,
         scaleFactor = 1) {
 
-    const circle = cpNode.cp.circle;
+    const circle = cpNode.pointOnShape.circle;
 
     let $svgs: SVGElement[] = [];
 

package/src/debug/functions/draw-elem/one-prong-at-dull-corner.ts

@@ -12,8 +12,8 @@ function oneProngAtDullCorner(
         delay = 1000,
         scaleFactor = 1) {
 
-    //let oCircle = PointOnShape.getOsculatingCircle(Number.POSITIVE_INFINITY, pos);
-    const oCircle = getOsculatingCircle(Number.POSITIVE_INFINITY, pos);
+    //let oCircle = PointOnShape.getOsculatingCircle(Infinity, pos);
+    const oCircle = getOsculatingCircle(Infinity, pos);
 
     const $center = drawFs.dot(g, pos.p, 0.1, 'orange');
     const $circle = drawFs.dot(g, oCircle.center, 0.25, 'orange');

package/src/debug/functions/general.ts

@@ -30,7 +30,7 @@ function nameObj(o: any, pre = '') {
  */
 function δToString(cpNodes: CpNode[]) {
     return cpNodes.map(
-        cpNode => posToHumanString(cpNode.cp.pointOnShape)
+        cpNode => posToHumanString(cpNode.pointOnShape)
     );
 }
 

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

@@ -1,249 +1,249 @@
-/** @internal */
-declare let _debug_: Debug; 
-
-import { drawFs } from 'flo-draw';
-import { equal, getObjClosestTo } from 'flo-vector2d';
-import { Debug } from '../debug.js';
-import { ThreeProngForDebugging } from '../three-prong-for-debugging.js';
-
-
-/** @internal */
-export interface IThreeProngDebugFunctions {
-    drawSpokes       : (g: SVGGElement, n: number) => void,
-    traceConvergence : (g: SVGGElement, n: number, indx: number) => void,
-    showBoundary     : (g: SVGGElement, n: number, indx: number) => void,
-    logδs            : (n: number) => void,
-    logNearest       : (
-            showSpokes?     : boolean,
-            showTrace?      : boolean,
-            showBoundaries? : boolean
-    ) => (g: SVGGElement, p: number[], showDelay?: number) => void
-}
-
-
-/**
- * @internal
- * Draws 3 lines from the given 3-prong center to its 3 contact points.
- * @param n - The 3-prong's zero-based index. 
- */
-function drawSpokes(g: SVGGElement, n: number): void {
-    const threeProng = _debug_.generated.elems.threeProng[n]; 
-    const cc = threeProng.circle.center;
-    const poss = threeProng.poss;
-
-    for (let i=0; i<poss.length; i++) {
-        const pos = poss[i];
-        drawFs.line(g, [pos.p, cc], 'thin5 red');
-    }
-}
-
-
-/**
- * @internal
- * Shows the circle for each boundary iteration.
- * @param n_ - The 3-prong's zero-based index. If ommitted, all will be shown.
- * @param idx - The specific boundary iteration index to view. If ommitted, all
- * will be shown.
- */
-function traceConvergence(g: SVGGElement, n_: number, idx: number): void {
-    let sIndx;
-    let eIndx;
-    if (n_ === undefined) {
-        sIndx = 0;
-        eIndx = _debug_.generated.elems.threeProng.length;
-    } else {
-        sIndx = n_;
-        eIndx = n_ + 1;
-    }
+// /** @internal */
+// declare let _debug_: Debug; 
+
+// import { drawFs } from 'flo-draw';
+// import { equal, getObjClosestTo } from 'flo-vector2d';
+// import { Debug } from '../debug.js';
+// import { ThreeProngForDebugging } from '../three-prong-for-debugging.js';
+
+
+// /** @internal */
+// export interface IThreeProngDebugFunctions {
+//     drawSpokes       : (g: SVGGElement, n: number) => void,
+//     traceConvergence : (g: SVGGElement, n: number, indx: number) => void,
+//     showBoundary     : (g: SVGGElement, n: number, indx: number) => void,
+//     logδs            : (n: number) => void,
+//     logNearest       : (
+//             showSpokes?     : boolean,
+//             showTrace?      : boolean,
+//             showBoundaries? : boolean
+//     ) => (g: SVGGElement, p: number[], showDelay?: number) => void
+// }
+
+
+// /**
+//  * @internal
+//  * Draws 3 lines from the given 3-prong center to its 3 contact points.
+//  * @param n - The 3-prong's zero-based index. 
+//  */
+// function drawSpokes(g: SVGGElement, n: number): void {
+//     const threeProng = _debug_.generated.elems.threeProng[n]; 
+//     const cc = threeProng.circle.center;
+//     const poss = threeProng.poss;
+
+//     for (let i=0; i<poss.length; i++) {
+//         const pos = poss[i];
+//         drawFs.line(g, [pos.p, cc], 'thin5 red');
+//     }
+// }
+
+
+// /**
+//  * @internal
+//  * Shows the circle for each boundary iteration.
+//  * @param n_ - The 3-prong's zero-based index. If ommitted, all will be shown.
+//  * @param idx - The specific boundary iteration index to view. If ommitted, all
+//  * will be shown.
+//  */
+// function traceConvergence(g: SVGGElement, n_: number, idx: number): void {
+//     let sIndx;
+//     let eIndx;
+//     if (n_ === undefined) {
+//         sIndx = 0;
+//         eIndx = _debug_.generated.elems.threeProng.length;
+//     } else {
+//         sIndx = n_;
+//         eIndx = n_ + 1;
+//     }
     
-    for (let n=sIndx; n<eIndx; n++) {
+//     for (let n=sIndx; n<eIndx; n++) {
 
-        const forDebugging = _debug_.generated.elems.threeProng[n];
-        //const g = forDebugging.generated.g;
+//         const forDebugging = _debug_.generated.elems.threeProng[n];
+//         //const g = forDebugging.generated.g;
         
-        console.log(forDebugging);
+//         console.log(forDebugging);
         
-        const candidateThreeProngs = forDebugging.candidateThreeProngs;
+//         const candidateThreeProngs = forDebugging.candidateThreeProngs;
         
-        //-----------------------------
-        //---- Get start and end index
-        //-----------------------------
-        let startIndx;
-        let endIndx;
-        if (n_ === undefined || idx === -1) {
-            startIndx = forDebugging.bestIndx;
-            endIndx   = forDebugging.bestIndx + 1;
-        } else {
-            if (idx === undefined) {
-                startIndx = 0;
-                endIndx   = candidateThreeProngs.length;
-            } else {
-                startIndx = idx;
-                endIndx   = idx + 1;
-            }    
-        }
-
-        //---------------------------------
-        //---- Draw candidate three-prongs
-        //---------------------------------
-        for (let i=startIndx; i<endIndx; i++) {
-            const circle = candidateThreeProngs[i].circle;
-            if (forDebugging.bestIndx === i) {
-                drawFs.dot(g, circle.center, 0.2, 'green');
-                drawFs.circle(g, circle, 'black thin10 nofill');    
-            } else {
-                drawFs.dot(g, circle.center, 0.2, 'cyan');
-                drawFs.circle(g, circle, 'cyan thin5 nofill');
-            }
-        }
-    }
-}
-
-
-/**
- * @internal
- * Shows the actual boundary for each iteration.
- * @param n The 3-prong's zero-based index.
- * @param idx The specific boundary iteration index to view. If ommitted will 
- * show all.
- */
-function showBoundary(g: SVGGElement, n: number, idx: number): void {
-    const debugInfo = _debug_.generated.elems.threeProng[n];
-    //const g = debugInfo.generated.g;
+//         //-----------------------------
+//         //---- Get start and end index
+//         //-----------------------------
+//         let startIndx;
+//         let endIndx;
+//         if (n_ === undefined || idx === -1) {
+//             startIndx = forDebugging.bestIndx;
+//             endIndx   = forDebugging.bestIndx + 1;
+//         } else {
+//             if (idx === undefined) {
+//                 startIndx = 0;
+//                 endIndx   = candidateThreeProngs.length;
+//             } else {
+//                 startIndx = idx;
+//                 endIndx   = idx + 1;
+//             }    
+//         }
+
+//         //---------------------------------
+//         //---- Draw candidate three-prongs
+//         //---------------------------------
+//         for (let i=startIndx; i<endIndx; i++) {
+//             const circle = candidateThreeProngs[i].circle;
+//             if (forDebugging.bestIndx === i) {
+//                 drawFs.dot(g, circle.center, 0.2, 'green');
+//                 drawFs.circle(g, circle, 'black thin10 nofill');    
+//             } else {
+//                 drawFs.dot(g, circle.center, 0.2, 'cyan');
+//                 drawFs.circle(g, circle, 'cyan thin5 nofill');
+//             }
+//         }
+//     }
+// }
+
+
+// /**
+//  * @internal
+//  * Shows the actual boundary for each iteration.
+//  * @param n The 3-prong's zero-based index.
+//  * @param idx The specific boundary iteration index to view. If ommitted will 
+//  * show all.
+//  */
+// function showBoundary(g: SVGGElement, n: number, idx: number): void {
+//     const debugInfo = _debug_.generated.elems.threeProng[n];
+//     //const g = debugInfo.generated.g;
     
-    const candidateThreeProngs = debugInfo.candidateThreeProngs;
+//     const candidateThreeProngs = debugInfo.candidateThreeProngs;
     
-    const startIndx = idx === undefined ? 0 : idx;
-    const endIndx   = idx === undefined ? candidateThreeProngs.length : idx;
+//     const startIndx = idx === undefined ? 0 : idx;
+//     const endIndx   = idx === undefined ? candidateThreeProngs.length : idx;
     
-    // Draw relevant δs
-    const cpss = debugInfo.cpss;
-    let j = 0;
-    // For each iteration of δ3s (indexed by j)
-    for (let idx=1; idx<cpss.length-1; idx++) {
+//     // Draw relevant δs
+//     const cpss = debugInfo.cpss;
+//     let j = 0;
+//     // For each iteration of δ3s (indexed by j)
+//     for (let idx=1; idx<cpss.length-1; idx++) {
         
-        if (!(j >= startIndx && j <= endIndx)) {
-            j++;
-            continue; 
-        }
+//         if (!(j >= startIndx && j <= endIndx)) {
+//             j++;
+//             continue; 
+//         }
         
-        const δ3s = [
-            cpss[0], 
-            cpss[idx], 
-            cpss[cpss.length-1]
-        ];
+//         const δ3s = [
+//             cpss[0], 
+//             cpss[idx], 
+//             cpss[cpss.length-1]
+//         ];
         
         
-        // For each of the 3 δs
-        for (let i=0; i<3; i++) {
-            const δ = δ3s[i];
-            const δS = δ[0]; // Delta Start
-            const δE = δ[1]; // Delta End
+//         // For each of the 3 δs
+//         for (let i=0; i<3; i++) {
+//             const δ = δ3s[i];
+//             const δS = δ[0]; // Delta Start
+//             const δE = δ[1]; // Delta End
             
-            const posS = δS.cp.pointOnShape;
-            const posE = δE.cp.pointOnShape;
+//             const posS = δS.cp.pointOnShape;
+//             const posE = δE.cp.pointOnShape;
             
-            const pS = posS.p;
-            const pE = posE.p;
+//             const pS = posS.p;
+//             const pE = posE.p;
             
-            const r = 1 + (i*0.5);
+//             const r = 1 + (i*0.5);
             
-            if (equal(pS, pE)) {
-                drawFs.crossHair(g, pS, 'red thin10 nofill', r); 
-            } else {
-                drawFs.crossHair(g, pS, 'green thin10 nofill', r);
-                drawFs.crossHair(g, pE, 'blue thin10 nofill', r);
-            }
-        }
+//             if (equal(pS, pE)) {
+//                 drawFs.crossHair(g, pS, 'red thin10 nofill', r); 
+//             } else {
+//                 drawFs.crossHair(g, pS, 'green thin10 nofill', r);
+//                 drawFs.crossHair(g, pE, 'blue thin10 nofill', r);
+//             }
+//         }
         
-        j++;
-    }
-}
+//         j++;
+//     }
+// }
 
 
-/**
- * @internal
- * @param n The 3-prong's zero-based index. 
- */
-function logδs(n: number): void {
-    const threeProng = _debug_.generated.elems.threeProng[n];
+// /**
+//  * @internal
+//  * @param n The 3-prong's zero-based index. 
+//  */
+// function logδs(n: number): void {
+//     const threeProng = _debug_.generated.elems.threeProng[n];
     
-    console.log(threeProng.cpss);        
-}
+//     console.log(threeProng.cpss);        
+// }
 
 
-/**
- * @internal
- * @param p
- */
-function logNearest(
-        showSpokes = true,
-        showTrace = true,
-        showBoundaries = true) {
+// /**
+//  * @internal
+//  * @param p
+//  */
+// function logNearest(
+//         showSpokes = true,
+//         showTrace = true,
+//         showBoundaries = true) {
 
-    return function(g: SVGGElement, p: number[], showDelay = 1000) {
-        const generated = _debug_.generated;
+//     return function(g: SVGGElement, p: number[], showDelay = 1000) {
+//         const generated = _debug_.generated;
 
-        const threeProng = getObjClosestTo<ThreeProngForDebugging>(
-            p, 
-            generated.elems.threeProng, 
-            threeProng => threeProng.circle ? threeProng.circle.center : [0,0]
-        )!;
+//         const threeProng = getObjClosestTo<ThreeProngForDebugging>(
+//             p, 
+//             generated.elems.threeProng, 
+//             threeProng => threeProng.circle ? threeProng.circle.center : [0,0]
+//         )!;
 
 
-        const circle = threeProng.circle;
-        //const g = threeProng.generated.g;
+//         const circle = threeProng.circle;
+//         //const g = threeProng.generated.g;
         
-        console.log(threeProng);
-
-        const circle2 = {
-            center: circle.center,
-            radius: circle.radius || 1
-        };
-
-        //const draw = _debug_.fs.draw;
-
-        drawFs.circle(g, circle2, 'blue thin10 nofill', showDelay);
-        drawFs.crossHair(g, circle.center, 'red thin2 nofill', 2, showDelay);
-
-        if (showSpokes) {
-            drawFs.line(g, [threeProng.poss[0].p, circle.center], 'blue thin5 nofill', showDelay);
-            drawFs.line(g, [threeProng.poss[1].p, circle.center], 'blue thin5 nofill', showDelay);
-            drawFs.line(g, [threeProng.poss[2].p, circle.center], 'blue thin5 nofill', showDelay);
-        }
-
-
-        if (showBoundaries) {
-            const boundaries = threeProng.boundaries;
-            const boundaryS = boundaries[0];
-            const boundaryE = boundaries[boundaries.length-1];
-
-            drawFs.beziers(g, boundaryS, 'red thin20 nofill', showDelay);
-            for (let i=1; i<boundaries.length-1; i++) {
-                const boundary = boundaries[i];
-                drawFs.beziers(g, boundary, 'green thin20 nofill', showDelay);
-            }
-            drawFs.beziers(g, boundaryE, 'blue thin20 nofill', showDelay);
-        }
-
-        if (showTrace) {
-            const traces = threeProng.traces;
-            for (const trace of traces) {
-                drawFs.polyline(g, trace, 'red thin5 nofill', showDelay)
-            }
-        }
-    }
-}
-
-
-/** @internal */
-const threeProngDebugFunctions: IThreeProngDebugFunctions = {
-    drawSpokes,
-    traceConvergence,
-    showBoundary,
-    logδs,
-    logNearest
-}    
+//         console.log(threeProng);
+
+//         const circle2 = {
+//             center: circle.center,
+//             radius: circle.radius || 1
+//         };
+
+//         //const draw = _debug_.fs.draw;
+
+//         drawFs.circle(g, circle2, 'blue thin10 nofill', showDelay);
+//         drawFs.crossHair(g, circle.center, 'red thin2 nofill', 2, showDelay);
+
+//         if (showSpokes) {
+//             drawFs.line(g, [threeProng.poss[0].p, circle.center], 'blue thin5 nofill', showDelay);
+//             drawFs.line(g, [threeProng.poss[1].p, circle.center], 'blue thin5 nofill', showDelay);
+//             drawFs.line(g, [threeProng.poss[2].p, circle.center], 'blue thin5 nofill', showDelay);
+//         }
+
+
+//         if (showBoundaries) {
+//             const boundaries = threeProng.boundaries;
+//             const boundaryS = boundaries[0];
+//             const boundaryE = boundaries[boundaries.length-1];
+
+//             drawFs.beziers(g, boundaryS, 'red thin20 nofill', showDelay);
+//             for (let i=1; i<boundaries.length-1; i++) {
+//                 const boundary = boundaries[i];
+//                 drawFs.beziers(g, boundary, 'green thin20 nofill', showDelay);
+//             }
+//             drawFs.beziers(g, boundaryE, 'blue thin20 nofill', showDelay);
+//         }
+
+//         if (showTrace) {
+//             const traces = threeProng.traces;
+//             for (const trace of traces) {
+//                 drawFs.polyline(g, trace, 'red thin5 nofill', showDelay)
+//             }
+//         }
+//     }
+// }
+
+
+// /** @internal */
+// const threeProngDebugFunctions: IThreeProngDebugFunctions = {
+//     drawSpokes,
+//     traceConvergence,
+//     showBoundary,
+//     logδs,
+//     logNearest
+// }    
     
 
-export { threeProngDebugFunctions }
+// export { threeProngDebugFunctions }