@tscircuit/capacity-autorouter 0.0.91 → 0.0.93

package/dist/index.js

@@ -6050,12 +6050,6 @@ var SingleTransitionCrossingRouteSolver = class extends BaseSolver {
       };
       return middle(effectiveA, effectiveB);
     };
-    const traceBounds = {
-      maxX: this.bounds.maxX - this.obstacleMargin - this.traceThickness / 2,
-      maxY: this.bounds.maxY - this.obstacleMargin - this.traceThickness / 2,
-      minX: this.bounds.minX + this.obstacleMargin + this.traceThickness / 2,
-      minY: this.bounds.minY + this.obstacleMargin + this.traceThickness / 2
-    };
     const minDistFromViaToTrace = this.viaDiameter / 2 + this.traceThickness / 2 + this.obstacleMargin;
     const p2 = middleWithMargin(
       via,
@@ -6282,6 +6276,7 @@ var ViaPossibilitiesSolver2 = class extends BaseSolver {
   currentHead;
   currentConnectionName;
   currentPath;
+  currentViaCount;
   constructor({
     nodeWithPortPoints,
     colorMap,
@@ -6306,8 +6301,6 @@ var ViaPossibilitiesSolver2 = class extends BaseSolver {
         hyperParameters.SHUFFLE_SEED
       );
     }
-    const nodeCenterX = (this.bounds.minX + this.bounds.maxX) / 2;
-    const nodeCenterY = (this.bounds.minY + this.bounds.maxY) / 2;
     for (const [connectionName, { start: start2, end }] of this.portPairMap.entries()) {
       if (start2.z === end.z) {
         const isVertical = Math.abs(start2.x - end.x) < 1e-9;
@@ -6349,6 +6342,7 @@ var ViaPossibilitiesSolver2 = class extends BaseSolver {
     const start = this.portPairMap.get(this.currentConnectionName).start;
     this.currentHead = this._padByNewHeadWallBuffer(start);
     this.currentPath = [start, this.currentHead];
+    this.currentViaCount = 0;
     this.placeholderPaths.delete(this.currentConnectionName);
   }
   _padByNewHeadWallBuffer(point) {
@@ -6420,10 +6414,17 @@ var ViaPossibilitiesSolver2 = class extends BaseSolver {
     checkIntersectionsWithPathMap(this.completedPaths);
     checkIntersectionsWithPathMap(this.placeholderPaths);
     const needsZChange = this.currentHead.z !== targetEnd.z;
+    if (closestIntersection || needsZChange) {
+      this.currentViaCount++;
+      if (this.currentViaCount >= this.maxViaCount) {
+        this.failed = true;
+        return;
+      }
+    }
     if (closestIntersection) {
       let viaXY;
       const distToIntersection = closestIntersection.dist;
-      if (distToIntersection < this.VIA_INTERSECTION_BUFFER_DISTANCE) {
+      if (distToIntersection <= this.VIA_INTERSECTION_BUFFER_DISTANCE + 1e-6) {
         viaXY = midpoint(this.currentHead, closestIntersection.point);
       } else {
         const intersectionPoint = closestIntersection.point;
@@ -6475,6 +6476,7 @@ var ViaPossibilitiesSolver2 = class extends BaseSolver {
         const { start } = this.portPairMap.get(this.currentConnectionName);
         this.currentHead = this._padByNewHeadWallBuffer(start);
         this.currentPath = [start, this.currentHead];
+        this.currentViaCount = 0;
         this.placeholderPaths.delete(this.currentConnectionName);
       }
     }
@@ -8807,9 +8809,6 @@ var MultiHeadPolyLineIntraNodeSolver3 = class extends MultiHeadPolyLineIntraNode
     });
     viaSolver.solve();
     if (viaSolver.failed || !viaSolver.solved) {
-      this.failed = true;
-      this.error = viaSolver.error ?? "ViaPossibilitiesSolver2 failed to find a solution.";
-      console.error(this.error);
       return null;
     }
     const polyLines = [];
@@ -8977,12 +8976,12 @@ var HyperSingleIntraNodeSolver = class extends HyperParameterSupervisorSolver {
   }
   getCombinationDefs() {
     return [
-      // ["closedFormTwoTrace"],
       ["multiHeadPolyLine"],
       ["majorCombinations", "orderings6", "cellSizeFactor"],
       ["noVias"],
       ["orderings50"],
-      ["flipTraceAlignmentDirection", "orderings6"]
+      ["flipTraceAlignmentDirection", "orderings6"],
+      ["closedFormTwoTrace"]
     ];
   }
   getHyperParameterDefs() {