@tscircuit/capacity-autorouter 0.0.86 → 0.0.88

package/dist/index.d.ts

@@ -114,6 +114,12 @@ declare class BaseSolver {
     getConstructorParams(): void;
     solve(): void;
     visualize(): GraphicsObject;
+    /**
+     * Called when the solver is about to fail, but we want to see if we have an
+     * "acceptable" or "passable" solution. Mostly used for optimizers that
+     * have an aggressive early stopping criterion.
+     */
+    tryFinalAcceptance(): void;
     /**
      * A lightweight version of the visualize method that can be used to stream
      * progress
@@ -422,6 +428,7 @@ interface HighDensityHyperParameters {
     SEGMENTS_PER_POLYLINE: number;
     BOUNDARY_PADDING: number;
     ITERATION_PENALTY: number;
+    MINIMUM_FINAL_ACCEPTANCE_GAP?: number;
 }
 
 type Node = {
@@ -762,11 +769,13 @@ declare class HyperSingleIntraNodeSolver extends HyperParameterSupervisorSolver<
             SEGMENTS_PER_POLYLINE: number;
             BOUNDARY_PADDING: number;
             ITERATION_PENALTY?: undefined;
+            MINIMUM_FINAL_ACCEPTANCE_GAP?: undefined;
         } | {
             MULTI_HEAD_POLYLINE_SOLVER: boolean;
             SEGMENTS_PER_POLYLINE: number;
             BOUNDARY_PADDING: number;
             ITERATION_PENALTY: number;
+            MINIMUM_FINAL_ACCEPTANCE_GAP: number;
         })[];
     })[];
     computeG(solver: IntraNodeRouteSolver): number;
@@ -1581,6 +1590,8 @@ declare class CapacityPathingMultiSectionSolver extends BaseSolver {
             endingScore: number;
             endingHighestNodePf: number;
         }>;
+        cacheHits: number;
+        cacheMisses: number;
     };
     OPTIMIZATION_SCHEDULE: {
         MAX_ATTEMPTS_PER_NODE: number;

package/dist/index.js

@@ -67,6 +67,9 @@ var BaseSolver = class {
       this.failed = true;
       throw e;
     }
+    if (!this.solved && this.iterations > this.MAX_ITERATIONS) {
+      this.tryFinalAcceptance();
+    }
     if (!this.solved && this.iterations > this.MAX_ITERATIONS) {
       this.error = `${this.constructor.name} ran out of iterations`;
       console.error(this.error);
@@ -97,6 +100,13 @@ var BaseSolver = class {
       circles: []
     };
   }
+  /**
+   * Called when the solver is about to fail, but we want to see if we have an
+   * "acceptable" or "passable" solution. Mostly used for optimizers that
+   * have an aggressive early stopping criterion.
+   */
+  tryFinalAcceptance() {
+  }
   /**
    * A lightweight version of the visualize method that can be used to stream
    * progress
@@ -8172,6 +8182,21 @@ var MultiHeadPolyLineIntraNodeSolver = class extends BaseSolver {
     });
     return minGapsToOtherConnectionsValid && allPointsWithinBounds;
   }
+  // ------------------------------------------------------------------
+  //  Try accepting the best candidate even if normal solving failed.
+  // ------------------------------------------------------------------
+  tryFinalAcceptance() {
+    const minGapTarget = this.hyperParameters?.MINIMUM_FINAL_ACCEPTANCE_GAP ?? void 0;
+    if (minGapTarget === void 0 || this.lastCandidate === null || this.lastCandidate.minGaps.length === 0)
+      return;
+    const minGapAchieved = Math.min(...this.lastCandidate.minGaps);
+    if (minGapAchieved >= minGapTarget) {
+      this.solved = true;
+      this._setSolvedRoutes();
+      return;
+    }
+    return;
+  }
   _step() {
     if (this.phase === "setup") {
       this.setupInitialPolyLines();
@@ -8180,6 +8205,8 @@ var MultiHeadPolyLineIntraNodeSolver = class extends BaseSolver {
     }
     const currentCandidate = this.candidates.shift();
     if (!currentCandidate) {
+      this.tryFinalAcceptance();
+      if (this.solved) return;
       this.failed = true;
       this.error = "No candidates left";
       return;
@@ -8413,6 +8440,8 @@ var MultiHeadPolyLineIntraNodeSolver2 = class extends MultiHeadPolyLineIntraNode
     }
     const currentCandidate = this.candidates.shift();
     if (!currentCandidate) {
+      this.tryFinalAcceptance();
+      if (this.solved) return;
       this.failed = true;
       return;
     }
@@ -9063,7 +9092,8 @@ var HyperSingleIntraNodeSolver = class extends HyperParameterSupervisorSolver {
             SEGMENTS_PER_POLYLINE: 6,
             BOUNDARY_PADDING: -0.05,
             // Allow vias/traces outside the boundary
-            ITERATION_PENALTY: 1e4
+            ITERATION_PENALTY: 1e4,
+            MINIMUM_FINAL_ACCEPTANCE_GAP: 1e-3
           }
         ]
       }
@@ -13522,6 +13552,7 @@ var CachedHyperCapacityPathingSingleSectionSolver = class extends HyperCapacityP
     });
     const terminals = {};
     const cacheSpaceToRealConnectionId = /* @__PURE__ */ new Map();
+    const connectionPairMap = /* @__PURE__ */ new Map();
     for (const conn of this.constructorParams.sectionConnectionTerminals) {
       const cacheStartNodeId = realToCacheSpaceNodeIdMap.get(conn.startNodeId);
       const cacheEndNodeId = realToCacheSpaceNodeIdMap.get(conn.endNodeId);
@@ -13529,7 +13560,10 @@ var CachedHyperCapacityPathingSingleSectionSolver = class extends HyperCapacityP
         cacheStartNodeId,
         cacheEndNodeId
       ].sort();
-      const cacheSpaceConnectionId = `${sortedStartId}->${sortedEndId}`;
+      const pairKey = `${sortedStartId}->${sortedEndId}`;
+      const pairIndex = connectionPairMap.get(pairKey) ?? 0;
+      connectionPairMap.set(pairKey, pairIndex + 1);
+      const cacheSpaceConnectionId = `${sortedStartId}->${sortedEndId}::${pairIndex}`;
       terminals[cacheSpaceConnectionId] = {
         start: sortedStartId,
         end: sortedEndId
@@ -13796,9 +13830,11 @@ var CapacityPathingMultiSectionSolver = class extends BaseSolver {
           endingHighestNodePf: 0,
           sectionAttempts: 0
         })
-      )
+      ),
+      cacheHits: 0,
+      cacheMisses: 0
     };
-    this.MAX_ITERATIONS = 1e7;
+    this.MAX_ITERATIONS = params.MAX_ITERATIONS ?? 1e7;
     this.cacheProvider = params.cacheProvider;
     this.simpleRouteJson = params.simpleRouteJson;
     this.nodes = params.nodes;
@@ -13943,6 +13979,13 @@ var CapacityPathingMultiSectionSolver = class extends BaseSolver {
       );
     }
     this.sectionSolver.step();
+    if (this.sectionSolver.failed || this.sectionSolver.solved) {
+      if (this.sectionSolver.cacheHit) {
+        this.stats.cacheHits++;
+      } else {
+        this.stats.cacheMisses++;
+      }
+    }
     if (this.sectionSolver.failed) {
       console.warn(
         `Section solver failed for node ${this.currentSection.centerNodeId}. Error: ${this.sectionSolver.error}`