@tscircuit/capacity-autorouter 0.0.50 → 0.0.51

package/dist/index.d.ts

@@ -559,6 +559,10 @@ declare class SingleHighDensityRouteSolver extends BaseSolver {
     debug_nodesTooCloseToObstacle: Set<string>;
     debug_nodePathToParentIntersectsObstacle: Set<string>;
     debugEnabled: boolean;
+    initialNodeGridOffset: {
+        x: number;
+        y: number;
+    };
     constructor(opts: {
         connectionName: string;
         obstacleRoutes: HighDensityIntraNodeRoute$1[];
@@ -1225,6 +1229,7 @@ declare class UnravelSectionSolver extends BaseSolver {
     colorMap: Record<string, string>;
     tunedNodeCapacityMap: Map<CapacityMeshNodeId, number>;
     MAX_CANDIDATES: number;
+    iterationsSinceImprovement: number;
     selectedCandidateIndex: number | "best" | "original" | null;
     queuedOrExploredCandidatePointModificationHashes: Set<string>;
     constructor(params: {

package/dist/index.js

@@ -2205,6 +2205,7 @@ var SingleHighDensityRouteSolver = class extends BaseSolver {
   debug_nodesTooCloseToObstacle;
   debug_nodePathToParentIntersectsObstacle;
   debugEnabled = true;
+  initialNodeGridOffset;
   constructor(opts) {
     super();
     this.bounds = opts.bounds;
@@ -2250,11 +2251,18 @@ var SingleHighDensityRouteSolver = class extends BaseSolver {
     if (this.futureConnections && this.futureConnections.length === 0 && this.obstacleRoutes.length === 0) {
       this.handleSimpleCases();
     }
+    const initialNodePosition = {
+      x: Math.round(opts.A.x / (this.cellStep / 2)) * (this.cellStep / 2),
+      y: Math.round(opts.A.y / (this.cellStep / 2)) * (this.cellStep / 2)
+    };
+    this.initialNodeGridOffset = {
+      x: initialNodePosition.x - Math.round(opts.A.x / this.cellStep) * this.cellStep,
+      y: initialNodePosition.y - Math.round(opts.A.y / this.cellStep) * this.cellStep
+    };
     this.candidates = new SingleRouteCandidatePriorityQueue([
       {
         ...opts.A,
-        x: Math.floor(opts.A.x / this.cellStep) * this.cellStep,
-        y: Math.floor(opts.A.y / this.cellStep) * this.cellStep,
+        ...initialNodePosition,
         z: opts.A.z ?? 0,
         g: 0,
         h: 0,
@@ -2317,7 +2325,7 @@ var SingleHighDensityRouteSolver = class extends BaseSolver {
         }
       }
       for (const via of route.vias) {
-        if (distance(node, via) < this.viaDiameter / 2 + margin) {
+        if (distance(node, via) < this.viaDiameter / 2 + this.traceThickness / 2 + margin) {
           return true;
         }
       }
@@ -2484,7 +2492,13 @@ var SingleHighDensityRouteSolver = class extends BaseSolver {
       goalDist,
       currentNode.z === this.B.z
     );
-    if (goalDist <= this.cellStep * Math.SQRT2 && currentNode.z === this.B.z) {
+    if (goalDist <= this.cellStep * Math.SQRT2 && currentNode.z === this.B.z && // Make sure the last segment doesn't intersect an obstacle
+    !this.doesPathToParentIntersectObstacle({
+      ...currentNode,
+      parent: currentNode,
+      x: this.B.x,
+      y: this.B.y
+    })) {
       this.solved = true;
       this.setSolvedPath(currentNode);
     }
@@ -2539,8 +2553,8 @@ z: ${this.B.z}`,
       if (this.debug_nodePathToParentIntersectsObstacle.has(nodeKey)) continue;
       graphics.rects.push({
         center: {
-          x: x + z * this.cellStep / 20,
-          y: y + z * this.cellStep / 20
+          x: x + this.initialNodeGridOffset.x + z * this.cellStep / 20,
+          y: y + this.initialNodeGridOffset.y + z * this.cellStep / 20
         },
         fill: z === 0 ? `rgba(255,0,255,${0.3 - i / this.debug_exploredNodesOrdered.length * 0.2})` : `rgba(0,0,255,${0.3 - i / this.debug_exploredNodesOrdered.length * 0.2})`,
         width: this.cellStep * 0.9,
@@ -5784,11 +5798,13 @@ var UnravelSectionSolver = class extends BaseSolver {
   colorMap;
   tunedNodeCapacityMap;
   MAX_CANDIDATES = 500;
+  iterationsSinceImprovement = 0;
   selectedCandidateIndex = null;
   queuedOrExploredCandidatePointModificationHashes = /* @__PURE__ */ new Set();
   constructor(params) {
     super();
     this.MUTABLE_HOPS = params.MUTABLE_HOPS ?? this.MUTABLE_HOPS;
+    this.MAX_ITERATIONS = 5e4;
     this.nodeMap = params.nodeMap;
     this.dedupedSegments = params.dedupedSegments;
     if (params.dedupedSegmentMap) {
@@ -6183,6 +6199,7 @@ var UnravelSectionSolver = class extends BaseSolver {
   }
   _step() {
     const candidate = this.candidates.shift();
+    this.iterationsSinceImprovement++;
     if (!candidate) {
       this.solved = true;
       return;
@@ -6190,6 +6207,7 @@ var UnravelSectionSolver = class extends BaseSolver {
     this.lastProcessedCandidate = candidate;
     if (candidate.f < (this.bestCandidate?.f ?? Infinity)) {
       this.bestCandidate = candidate;
+      this.iterationsSinceImprovement = 0;
     }
     this.getNeighbors(candidate).forEach((neighbor) => {
       const isPartialHashExplored = this.queuedOrExploredCandidatePointModificationHashes.has(
@@ -6591,8 +6609,7 @@ var UnravelMultiSectionSolver = class extends BaseSolver {
     }
     this.activeSolver.step();
     const { bestCandidate, originalCandidate, lastProcessedCandidate } = this.activeSolver;
-    const giveUpFactor = 1 + 4 * (1 - Math.min(1, this.activeSolver.iterations / 40));
-    const shouldEarlyStop = lastProcessedCandidate && lastProcessedCandidate.g > bestCandidate.g * giveUpFactor;
+    const shouldEarlyStop = this.activeSolver.iterationsSinceImprovement > 200;
     if (this.activeSolver.solved || shouldEarlyStop) {
       const foundBetterSolution = bestCandidate && bestCandidate.g < originalCandidate.g;
       if (foundBetterSolution) {