@tscircuit/capacity-autorouter 0.0.28 → 0.0.29

package/dist/index.d.ts

@@ -74,6 +74,7 @@ interface CapacityMeshNode {
     _containsTarget?: boolean;
     _targetConnectionName?: string;
     _strawNode?: boolean;
+    _strawParentCapacityMeshNodeId?: CapacityMeshNodeId;
     _parent?: CapacityMeshNode;
 }
 interface CapacityMeshEdge {
@@ -252,7 +253,7 @@ declare class CapacityPathingSolver extends BaseSolver {
     getBacktrackedPath(candidate: Candidate): CapacityMeshNode[];
     getNeighboringNodes(node: CapacityMeshNode): CapacityMeshNode[];
     getCapacityPaths(): CapacityPath[];
-    doesNodeHaveCapacityForTrace(node: CapacityMeshNode): boolean;
+    doesNodeHaveCapacityForTrace(node: CapacityMeshNode, prevNode: CapacityMeshNode): boolean;
     canTravelThroughObstacle(node: CapacityMeshNode, connectionName: string): boolean;
     getDistanceBetweenNodes(A: CapacityMeshNode, B: CapacityMeshNode): number;
     reduceCapacityAlongPath(nextConnection: {

package/dist/index.js

@@ -156,7 +156,8 @@ var CapacityMeshEdgeSolver = class extends BaseSolver {
     this.edges = [];
     for (let i = 0; i < this.nodes.length; i++) {
       for (let j = i + 1; j < this.nodes.length; j++) {
-        if (!(this.nodes[i]._strawNode && this.nodes[j]._strawNode) && areNodesBordering(this.nodes[i], this.nodes[j]) && this.doNodesHaveSharedLayer(this.nodes[i], this.nodes[j])) {
+        const strawNodesWithSameParent = this.nodes[i]._strawNode && this.nodes[j]._strawNode && this.nodes[i]._strawParentCapacityMeshNodeId === this.nodes[j]._strawParentCapacityMeshNodeId;
+        if (!strawNodesWithSameParent && areNodesBordering(this.nodes[i], this.nodes[j]) && this.doNodesHaveSharedLayer(this.nodes[i], this.nodes[j])) {
           this.edges.push({
             capacityMeshEdgeId: this.getNextCapacityMeshEdgeId(),
             nodeIds: [
@@ -1113,6 +1114,29 @@ var mapLayerNameToZ = (layerName, layerCount) => {
   return parseInt(layerName.slice(5));
 };
 
+// lib/utils/getTunedTotalCapacity1.ts
+var getTunedTotalCapacity1 = (nodeOrWidth, maxCapacityFactor = 1) => {
+  const VIA_DIAMETER = 0.6;
+  const TRACE_WIDTH = 0.15;
+  const obstacleMargin = 0.2;
+  const width = "width" in nodeOrWidth ? nodeOrWidth.width : nodeOrWidth;
+  const viaLengthAcross = width / (VIA_DIAMETER / 2 + obstacleMargin);
+  return (viaLengthAcross / 2) ** 1.1 * maxCapacityFactor;
+};
+var calculateOptimalCapacityDepth = (initialWidth, targetMinCapacity = 0.5, maxDepth = 16) => {
+  let depth = 0;
+  let width = initialWidth;
+  while (depth < maxDepth) {
+    const capacity = getTunedTotalCapacity1({ width });
+    if (capacity <= targetMinCapacity) {
+      break;
+    }
+    width /= 2;
+    depth++;
+  }
+  return Math.max(1, depth);
+};
+
 // lib/solvers/CapacityMeshSolver/CapacityMeshNodeSolver1.ts
 var CapacityMeshNodeSolver = class extends BaseSolver {
   constructor(srj, opts = {}) {
@@ -1407,7 +1431,9 @@ var CapacityMeshNodeSolver = class extends BaseSolver {
           node.capacityMeshNodeId,
           `availableZ: ${node.availableZ.join(",")}`,
           `target? ${node._containsTarget ?? false}`,
-          `obs? ${node._containsObstacle ?? false}`
+          `obs? ${node._containsObstacle ?? false}`,
+          `${node.width.toFixed(2)}x${node.height.toFixed(2)}`,
+          `capacity: ${getTunedTotalCapacity1(node).toFixed(2)}`
         ].join("\n")
       });
     }
@@ -2058,7 +2084,7 @@ var SingleHighDensityRouteSolver = class extends BaseSolver {
     return false;
   }
   isNodeTooCloseToEdge(node, isVia) {
-    const margin = isVia ? this.viaDiameter / 2 : this.obstacleMargin;
+    const margin = isVia ? this.viaDiameter / 2 + this.obstacleMargin / 2 : this.obstacleMargin / 2;
     const tooClose = node.x < this.bounds.minX + margin || node.x > this.bounds.maxX - margin || node.y < this.bounds.minY + margin || node.y > this.bounds.maxY - margin;
     if (tooClose && !isVia) {
       if (distance(node, this.B) < margin * 2 || distance(node, this.A) < margin * 2) {
@@ -3134,29 +3160,6 @@ var getConnectivityMapFromSimpleRouteJson = (srj) => {
   return connMap;
 };
 
-// lib/utils/getTunedTotalCapacity1.ts
-var getTunedTotalCapacity1 = (nodeOrWidth, maxCapacityFactor = 1) => {
-  const VIA_DIAMETER = 0.6;
-  const TRACE_WIDTH = 0.15;
-  const obstacleMargin = 0.2;
-  const width = "width" in nodeOrWidth ? nodeOrWidth.width : nodeOrWidth;
-  const viaLengthAcross = width / (VIA_DIAMETER / 2 + obstacleMargin);
-  return (viaLengthAcross / 2) ** 1.1 * maxCapacityFactor;
-};
-var calculateOptimalCapacityDepth = (initialWidth, targetMinCapacity = 0.5, maxDepth = 16) => {
-  let depth = 0;
-  let width = initialWidth;
-  while (depth < maxDepth) {
-    const capacity = getTunedTotalCapacity1({ width });
-    if (capacity <= targetMinCapacity) {
-      break;
-    }
-    width /= 2;
-    depth++;
-  }
-  return Math.max(1, depth);
-};
-
 // lib/solvers/NetToPointPairsSolver/buildMinimumSpanningTree.ts
 var KDNode = class {
   point;
@@ -5029,9 +5032,9 @@ var UnravelMultiSectionSolver = class extends BaseSolver {
 var createRectFromCapacityNode = (node, opts = {}) => {
   const lowestZ = Math.min(...node.availableZ);
   return {
-    center: !opts.rectMargin ? {
-      x: node.center.x + lowestZ * node.width * 0.05,
-      y: node.center.y - lowestZ * node.width * 0.05
+    center: !opts.rectMargin || opts.zOffset ? {
+      x: node.center.x + lowestZ * node.width * (opts.zOffset ?? 0.05),
+      y: node.center.y - lowestZ * node.width * (opts.zOffset ?? 0.05)
     } : node.center,
     width: opts.rectMargin ? node.width - opts.rectMargin * 2 : Math.max(node.width - 0.5, node.width * 0.8),
     height: opts.rectMargin ? node.height - opts.rectMargin * 2 : Math.max(node.height - 0.5, node.height * 0.8),
@@ -5173,12 +5176,16 @@ var CapacityPathingSolver = class extends BaseSolver {
     }
     return capacityPaths;
   }
-  doesNodeHaveCapacityForTrace(node) {
+  doesNodeHaveCapacityForTrace(node, prevNode) {
     const usedCapacity = this.usedNodeCapacityMap.get(node.capacityMeshNodeId) ?? 0;
     const totalCapacity = this.getTotalCapacity(node);
     if (node.availableZ.length === 1 && !node._containsTarget && usedCapacity > 0)
       return false;
-    return usedCapacity < totalCapacity;
+    let additionalCapacityRequirement = 0;
+    if (node.availableZ.length > 1 && prevNode.availableZ.length === 1) {
+      additionalCapacityRequirement += 0.5;
+    }
+    return usedCapacity + additionalCapacityRequirement < totalCapacity;
   }
   canTravelThroughObstacle(node, connectionName) {
     const goalNodeIds = this.connectionNameToGoalNodeIds.get(connectionName);
@@ -5246,7 +5253,7 @@ var CapacityPathingSolver = class extends BaseSolver {
       if (this.visitedNodes?.has(neighborNode.capacityMeshNodeId)) {
         continue;
       }
-      if (!this.doesNodeHaveCapacityForTrace(neighborNode)) {
+      if (!this.doesNodeHaveCapacityForTrace(neighborNode, currentCandidate.node)) {
         continue;
       }
       const connectionName = this.connectionsWithNodes[this.currentConnectionIndex].connection.name;
@@ -5285,27 +5292,42 @@ var CapacityPathingSolver = class extends BaseSolver {
         if (conn.path && conn.path.length > 0) {
           const pathPoints = conn.path.map(({ center: { x, y }, width }) => ({
             // slight offset to allow viewing overlapping paths
-            x: x + (i % 10 + i % 19) * (0.01 * width),
-            y: y + (i % 10 + i % 19) * (0.01 * width)
+            x: x + (i % 10 + i % 19) * (5e-3 * width),
+            y: y + (i % 10 + i % 19) * (5e-3 * width)
           }));
           graphics.lines.push({
             points: pathPoints,
             strokeColor: this.colorMap[conn.connection.name]
           });
+          for (let u = 0; u < pathPoints.length; u++) {
+            const point = pathPoints[u];
+            graphics.points.push({
+              x: point.x,
+              y: point.y,
+              label: [
+                `conn: ${conn.connection.name}`,
+                `node: ${conn.path[u].capacityMeshNodeId}`
+              ].join("\n")
+            });
+          }
         }
       }
     }
     for (const node of this.nodes) {
       const nodeCosts = this.debug_lastNodeCostMap.get(node.capacityMeshNodeId);
       graphics.rects.push({
-        ...createRectFromCapacityNode(node),
+        ...createRectFromCapacityNode(node, {
+          rectMargin: 0.025,
+          zOffset: 0.01
+        }),
         label: [
           `${node.capacityMeshNodeId}`,
           `${this.usedNodeCapacityMap.get(node.capacityMeshNodeId)}/${this.getTotalCapacity(node).toFixed(2)}`,
           `${node.width.toFixed(2)}x${node.height.toFixed(2)}`,
           `g: ${nodeCosts?.g !== void 0 ? nodeCosts.g.toFixed(2) : "?"}`,
           `h: ${nodeCosts?.h !== void 0 ? nodeCosts.h.toFixed(2) : "?"}`,
-          `f: ${nodeCosts?.f !== void 0 ? nodeCosts.f.toFixed(2) : "?"}`
+          `f: ${nodeCosts?.f !== void 0 ? nodeCosts.f.toFixed(2) : "?"}`,
+          `z: ${node.availableZ.join(", ")}`
         ].join("\n")
       });
     }
@@ -5315,7 +5337,8 @@ var CapacityPathingSolver = class extends BaseSolver {
           for (const point of conn.connection.pointsToConnect) {
             graphics.points.push({
               x: point.x,
-              y: point.y
+              y: point.y,
+              label: [`pointsToConnect ${conn.connection.name}`].join("\n")
             });
           }
         }
@@ -5371,18 +5394,6 @@ var CapacityPathingSolver5 = class extends CapacityPathingSolver {
    */
   getNodeCapacityPenalty(node) {
     return 0.05;
-    if (node.availableZ.length === 1) {
-      return 0;
-    }
-    const totalCapacity = this.getTotalCapacity(node);
-    const usedCapacity = this.usedNodeCapacityMap.get(node.capacityMeshNodeId) ?? 0;
-    const remainingCapacity = totalCapacity - usedCapacity;
-    const dist = this.activeCandidateStraightLineDistance;
-    if (remainingCapacity <= 0) {
-      const penalty = (-remainingCapacity + 1) / totalCapacity * dist * (this.NEGATIVE_CAPACITY_PENALTY_FACTOR / 4);
-      return penalty ** 2;
-    }
-    return 1 / remainingCapacity * dist * this.REDUCED_CAPACITY_PENALTY_FACTOR / 8;
   }
   /**
    * We're rewarding travel into big nodes.
@@ -5509,7 +5520,8 @@ var StrawSolver = class extends BaseSolver {
           layer: node.layer,
           availableZ: [...node.availableZ],
           _depth: node._depth,
-          _strawNode: true
+          _strawNode: true,
+          _strawParentCapacityMeshNodeId: node.capacityMeshNodeId
         });
       }
     } else {
@@ -5525,7 +5537,8 @@ var StrawSolver = class extends BaseSolver {
           layer: node.layer,
           availableZ: [...node.availableZ],
           _depth: node._depth,
-          _strawNode: true
+          _strawNode: true,
+          _strawParentCapacityMeshNodeId: node.capacityMeshNodeId
         });
       }
     }
@@ -5581,7 +5594,8 @@ ${node.width}x${node.height}`
         stroke: "rgba(0, 0, 0, 0.5)",
         label: `${node.capacityMeshNodeId}
 Layer: ${node.availableZ[0]}
-${node.width}x${node.height}`
+${node.width}x${node.height}`,
+        layer: `z${node.availableZ.join(",")}`
       });
     }
     for (const node of this.multiLayerNodes) {
@@ -5629,6 +5643,13 @@ var SingleLayerNodeMergerSolver = class extends BaseSolver {
       }
     }
     nodeWithArea.sort((a, b) => a[1] - b[1]);
+    for (const [nodeId, area] of nodeWithArea) {
+      const node = this.nodeMap.get(nodeId);
+      this.nodeMap.set(nodeId, {
+        ...node,
+        center: { ...node.center }
+      });
+    }
     this.currentBatchNodeIds = nodeWithArea.map((n) => n[0]);
     this.nextBatchNodeIds = [];
     this.batchHadModifications = false;
@@ -5887,7 +5908,7 @@ var SingleSimplifiedPathSolver = class extends BaseSolver {
         ],
         strokeColor: "rgba(255, 0, 0, 0.8)",
         strokeDash: this.inputRoute.route[i].z === 1 ? "5, 5" : void 0,
-        layer: this.inputRoute.route[i].z.toString()
+        layer: `z${this.inputRoute.route[i].z.toString()}`
       });
     }
     for (let i = 0; i < this.newRoute.length; i++) {
@@ -5900,7 +5921,7 @@ var SingleSimplifiedPathSolver = class extends BaseSolver {
           strokeWidth: 0.15,
           strokeColor: "rgba(0, 255, 0, 0.8)",
           strokeDash: this.newRoute[i].z === 1 ? [0.4, 0.4] : void 0,
-          layer: this.newRoute[i].z.toString()
+          layer: `z${this.newRoute[i].z.toString()}`
         });
       }
       graphics.points.push({
@@ -5908,7 +5929,7 @@ var SingleSimplifiedPathSolver = class extends BaseSolver {
         y: this.newRoute[i].y,
         color: "rgba(0, 255, 0, 0.8)",
         label: `z: ${this.newRoute[i].z}`,
-        layer: this.newRoute[i].z.toString()
+        layer: `z${this.newRoute[i].z.toString()}`
       });
     }
     for (const via of this.newVias) {
@@ -5936,7 +5957,7 @@ var SingleSimplifiedPathSolver = class extends BaseSolver {
           strokeWidth: 0.15,
           strokeColor: route.route[i].z === 0 ? "rgba(255, 0, 255, 0.5)" : route.route[i].z === 1 ? "rgba(128, 0, 128, 0.5)" : "rgba(0, 0, 255, 0.5)",
           // bottom layer (blue)
-          layer: route.route[i].z.toString()
+          layer: `z${route.route[i].z.toString()}`
         });
       }
     }
@@ -6481,7 +6502,7 @@ var MultiSimplifiedPathSolver = class extends BaseSolver {
           strokeColor: "rgba(255, 0, 0, 0.2)",
           strokeDash: [0.5, 0.5],
           step: 0,
-          layer: route.route[i].z.toString()
+          layer: `z${route.route[i].z.toString()}`
         });
       }
       for (const point of route.vias) {
@@ -6587,17 +6608,18 @@ var CapacityMeshSolver = class extends BaseSolver {
         }
       }
     ),
-    // definePipelineStep("nodeSolver", CapacityMeshNodeSolver, (cms) => [
-    //   cms.netToPointPairsSolver?.getNewSimpleRouteJson() || cms.srj,
-    //   cms.opts,
-    // ]),
     definePipelineStep(
       "nodeSolver",
       CapacityMeshNodeSolver2_NodeUnderObstacle,
       (cms) => [
         cms.netToPointPairsSolver?.getNewSimpleRouteJson() || cms.srj,
         cms.opts
-      ]
+      ],
+      {
+        onSolved: (cms) => {
+          cms.capacityNodes = cms.nodeSolver?.finishedNodes;
+        }
+      }
     ),
     // definePipelineStep("nodeTargetMerger", CapacityNodeTargetMerger, (cms) => [
     //   cms.nodeSolver?.finishedNodes || [],
@@ -6614,7 +6636,12 @@ var CapacityMeshSolver = class extends BaseSolver {
     definePipelineStep(
       "singleLayerNodeMerger",
       SingleLayerNodeMergerSolver,
-      (cms) => [cms.nodeSolver?.finishedNodes]
+      (cms) => [cms.nodeSolver?.finishedNodes],
+      {
+        onSolved: (cms) => {
+          cms.capacityNodes = cms.singleLayerNodeMerger?.newNodes;
+        }
+      }
     ),
     definePipelineStep(
       "strawSolver",