@tscircuit/capacity-autorouter 0.0.60 → 0.0.62

package/dist/index.d.ts

@@ -101,7 +101,7 @@ declare class BaseSolver {
     activeSubSolver?: BaseSolver | null;
     failedSubSolvers?: BaseSolver[];
     timeToSolve?: number;
-    stats: Record<string, number>;
+    stats: Record<string, any>;
     /**
      * For cached solvers
      **/
@@ -704,6 +704,7 @@ declare class HyperSingleIntraNodeSolver extends HyperParameterSupervisorSolver<
     constructorParams: ConstructorParameters<typeof IntraNodeRouteSolver>[0];
     solvedRoutes: HighDensityIntraNodeRoute$1[];
     nodeWithPortPoints: NodeWithPortPoints;
+    connMap?: ConnectivityMap;
     constructor(opts: ConstructorParameters<typeof IntraNodeRouteSolver>[0]);
     getCombinationDefs(): string[][];
     getHyperParameterDefs(): ({
@@ -1523,18 +1524,37 @@ declare class CapacityPathingMultiSectionSolver extends BaseSolver {
     nodeOptimizationAttemptCountMap: Map<CapacityMeshNodeId, number>;
     currentSection: CapacityPathingSection | null;
     sectionSolver?: CapacityPathingSingleSectionSolver | HyperCapacityPathingSingleSectionSolver | null;
-    MAX_ATTEMPTS_PER_NODE: number;
-    MINIMUM_PROBABILITY_OF_FAILURE_TO_OPTIMIZE: number;
-    MAX_EXPANSION_DEGREES: number;
+    currentScheduleIndex: number;
     stats: {
         successfulOptimizations: number;
         failedOptimizations: number;
+        failedSectionSolvers: number;
+        scheduleScores: Array<{
+            maxExpansionDegrees: number;
+            sectionAttempts: number;
+            endingScore: number;
+            endingHighestNodePf: number;
+        }>;
+    };
+    OPTIMIZATION_SCHEDULE: {
+        MAX_ATTEMPTS_PER_NODE: number;
+        MAX_EXPANSION_DEGREES: number;
+        MINIMUM_PROBABILITY_OF_FAILURE_TO_OPTIMIZE: number;
+    }[];
+    get currentSchedule(): {
+        MAX_ATTEMPTS_PER_NODE: number;
+        MAX_EXPANSION_DEGREES: number;
+        MINIMUM_PROBABILITY_OF_FAILURE_TO_OPTIMIZE: number;
     };
     constructor(params: ConstructorParameters<typeof CapacityPathingSolver>[0] & {
         initialPathingSolver?: CapacityPathingGreedySolver;
     });
     _stepInitialization(): void;
     _getNextNodeToOptimize(): CapacityMeshNodeId | null;
+    getOverallScore(): {
+        highestNodePf: number;
+        score: number;
+    };
     _stepSectionOptimization(): void;
     /**
      * Merges the paths found by a successful section solver back into the main

package/dist/index.js

@@ -68,7 +68,7 @@ var BaseSolver = class {
       throw e;
     }
     if (!this.solved && this.iterations > this.MAX_ITERATIONS) {
-      this.error = `${this.constructor.name} did not converge`;
+      this.error = `${this.constructor.name} ran out of iterations`;
       console.error(this.error);
       this.failed = true;
     }
@@ -3897,7 +3897,12 @@ var IntraNodeRouteSolver = class extends BaseSolver {
         y: points[points.length - 1].y,
         z: points[points.length - 1].z
       },
-      obstacleRoutes: this.solvedRoutes,
+      obstacleRoutes: this.connMap ? this.solvedRoutes.filter(
+        (sr) => !this.connMap.areIdsConnected(
+          sr.connectionName,
+          connectionName
+        )
+      ) : this.solvedRoutes,
       futureConnections: this.unsolvedConnections,
       layerCount: 2,
       hyperParameters: this.hyperParameters,
@@ -8837,9 +8842,11 @@ var HyperSingleIntraNodeSolver = class extends HyperParameterSupervisorSolver {
   constructorParams;
   solvedRoutes = [];
   nodeWithPortPoints;
+  connMap;
   constructor(opts) {
     super();
     this.nodeWithPortPoints = opts.nodeWithPortPoints;
+    this.connMap = opts.connMap;
     this.constructorParams = opts;
     this.MAX_ITERATIONS = 25e4;
     this.GREEDY_MULTIPLIER = 5;
@@ -8983,6 +8990,7 @@ var HyperSingleIntraNodeSolver = class extends HyperParameterSupervisorSolver {
     if (hyperParameters.MULTI_HEAD_POLYLINE_SOLVER) {
       return new MultiHeadPolyLineIntraNodeSolver3({
         nodeWithPortPoints: this.nodeWithPortPoints,
+        connMap: this.connMap,
         hyperParameters
       });
     }
@@ -9071,7 +9079,7 @@ var HighDensitySolver = class extends BaseSolver {
       if (this.failedSolvers.length > 0) {
         this.solved = false;
         this.failed = true;
-        this.error = `Failed to solve ${this.failedSolvers.length} nodes, ${this.failedSolvers.slice(0, 5).map((fs) => fs.nodeWithPortPoints.capacityMeshNodeId)}`;
+        this.error = `Failed to solve ${this.failedSolvers.length} nodes, ${this.failedSolvers.slice(0, 5).map((fs) => fs.nodeWithPortPoints.capacityMeshNodeId)}. err0: ${this.failedSolvers[0].error}.`;
         return;
       }
       this.solved = true;
@@ -12731,7 +12739,7 @@ ${percent}% (Pf: ${(probabilityOfFailure * 100).toFixed(1)}%)`;
   return graphics;
 }
 
-// lib/solvers/CapacityPathingSectionSolver/CapacityPathingSingleSectionPathingSolver.ts
+// lib/solvers/CapacityPathingSectionSolver/CapacityPathingSingleSectionSolver.ts
 var CapacityPathingSingleSectionSolver = class extends BaseSolver {
   GREEDY_MULTIPLIER = 1.5;
   sectionNodes;
@@ -12758,6 +12766,7 @@ var CapacityPathingSingleSectionSolver = class extends BaseSolver {
   // Default, similar to CapacityPathingSolver5
   constructor(params) {
     super();
+    this.MAX_ITERATIONS = 1e4;
     this.centerNodeId = params.centerNodeId;
     this.sectionNodes = params.sectionNodes;
     this.sectionEdges = params.sectionEdges;
@@ -13066,7 +13075,7 @@ var HyperCapacityPathingSingleSectionSolver = class extends HyperParameterSuperv
   winningSolver;
   constructor(params) {
     super();
-    this.MAX_ITERATIONS = 1e4;
+    this.MAX_ITERATIONS = 1e5;
     this.constructorParams = params;
   }
   computeG(solver) {
@@ -13230,15 +13239,42 @@ var CapacityPathingMultiSectionSolver = class extends BaseSolver {
   nodeOptimizationAttemptCountMap = /* @__PURE__ */ new Map();
   currentSection = null;
   sectionSolver = null;
-  MAX_ATTEMPTS_PER_NODE = 1;
-  MINIMUM_PROBABILITY_OF_FAILURE_TO_OPTIMIZE = 0.05;
-  MAX_EXPANSION_DEGREES = 5;
+  currentScheduleIndex = 0;
   stats;
+  OPTIMIZATION_SCHEDULE = [
+    {
+      MAX_ATTEMPTS_PER_NODE: 1,
+      MAX_EXPANSION_DEGREES: 3,
+      MINIMUM_PROBABILITY_OF_FAILURE_TO_OPTIMIZE: 0.05
+    },
+    {
+      MAX_ATTEMPTS_PER_NODE: 2,
+      MAX_EXPANSION_DEGREES: 5,
+      MINIMUM_PROBABILITY_OF_FAILURE_TO_OPTIMIZE: 0.2
+    },
+    {
+      MAX_ATTEMPTS_PER_NODE: 3,
+      MAX_EXPANSION_DEGREES: 7,
+      MINIMUM_PROBABILITY_OF_FAILURE_TO_OPTIMIZE: 0.3
+    }
+  ];
+  get currentSchedule() {
+    return this.OPTIMIZATION_SCHEDULE[this.currentScheduleIndex] ?? null;
+  }
   constructor(params) {
     super();
     this.stats = {
       successfulOptimizations: 0,
-      failedOptimizations: 0
+      failedOptimizations: 0,
+      failedSectionSolvers: 0,
+      scheduleScores: this.OPTIMIZATION_SCHEDULE.map(
+        ({ MAX_EXPANSION_DEGREES }) => ({
+          maxExpansionDegrees: MAX_EXPANSION_DEGREES,
+          endingScore: 0,
+          endingHighestNodePf: 0,
+          sectionAttempts: 0
+        })
+      )
     };
     this.MAX_ITERATIONS = 1e7;
     this.simpleRouteJson = params.simpleRouteJson;
@@ -13300,7 +13336,7 @@ var CapacityPathingMultiSectionSolver = class extends BaseSolver {
         node.availableZ.length
       );
       const nodePfDivAttempts = nodePf / (attemptCount + 1);
-      if (attemptCount < this.MAX_ATTEMPTS_PER_NODE && nodePfDivAttempts > highestNodePfDivAttempts && nodePf > this.MINIMUM_PROBABILITY_OF_FAILURE_TO_OPTIMIZE) {
+      if (attemptCount < this.currentSchedule.MAX_ATTEMPTS_PER_NODE && nodePfDivAttempts > highestNodePfDivAttempts && nodePf > this.currentSchedule.MINIMUM_PROBABILITY_OF_FAILURE_TO_OPTIMIZE) {
         highestNodePfDivAttempts = nodePfDivAttempts;
         highestNodePf = nodePf;
         nodeWithHighestPercentCapacityUsed = node.capacityMeshNodeId;
@@ -13308,11 +13344,45 @@ var CapacityPathingMultiSectionSolver = class extends BaseSolver {
     }
     return nodeWithHighestPercentCapacityUsed;
   }
+  getOverallScore() {
+    let highestNodePf = 0;
+    for (const node of this.nodes) {
+      if (node._containsTarget) continue;
+      const totalCapacity = this.totalNodeCapacityMap.get(
+        node.capacityMeshNodeId
+      );
+      const nodePf = calculateNodeProbabilityOfFailure2(
+        this.usedNodeCapacityMap.get(node.capacityMeshNodeId) ?? 0,
+        totalCapacity,
+        node.availableZ.length
+      );
+      if (nodePf > highestNodePf) {
+        highestNodePf = nodePf;
+      }
+    }
+    return {
+      highestNodePf,
+      score: computeSectionScore({
+        totalNodeCapacityMap: this.totalNodeCapacityMap,
+        usedNodeCapacityMap: this.usedNodeCapacityMap,
+        nodeMap: this.nodeMap,
+        sectionNodeIds: new Set(
+          this.nodes.map((node) => node.capacityMeshNodeId)
+        )
+      })
+    };
+  }
   _stepSectionOptimization() {
     if (!this.sectionSolver) {
       const centerNodeId = this._getNextNodeToOptimize();
       if (!centerNodeId) {
-        this.solved = true;
+        const { highestNodePf, score } = this.getOverallScore();
+        this.stats.scheduleScores[this.currentScheduleIndex].endingHighestNodePf = highestNodePf;
+        this.stats.scheduleScores[this.currentScheduleIndex].endingScore = score;
+        this.currentScheduleIndex++;
+        if (!this.currentSchedule) {
+          this.solved = true;
+        }
         return;
       }
       const section = computeSectionNodesTerminalsAndEdges({
@@ -13320,16 +13390,18 @@ var CapacityPathingMultiSectionSolver = class extends BaseSolver {
         connectionsWithNodes: this.connectionsWithNodes,
         nodeMap: this.nodeMap,
         edges: this.edges,
-        expansionDegrees: this.MAX_EXPANSION_DEGREES,
+        expansionDegrees: this.currentSchedule.MAX_EXPANSION_DEGREES,
+        // Corrected
         nodeEdgeMap: this.nodeEdgeMap
       });
+      this.stats.scheduleScores[this.currentScheduleIndex].sectionAttempts++;
       this.currentSection = section;
       this.sectionSolver = new HyperCapacityPathingSingleSectionSolver({
-        sectionConnectionTerminals: section.sectionConnectionTerminals,
-        sectionEdges: section.sectionEdges,
-        sectionNodes: section.sectionNodes,
+        sectionNodes: this.currentSection.sectionNodes,
+        sectionEdges: this.currentSection.sectionEdges,
+        sectionConnectionTerminals: this.currentSection.sectionConnectionTerminals,
         colorMap: this.colorMap,
-        centerNodeId: section.centerNodeId,
+        centerNodeId: this.currentSection.centerNodeId,
         nodeEdgeMap: this.nodeEdgeMap
       });
       this.activeSubSolver = this.sectionSolver;
@@ -13343,6 +13415,8 @@ var CapacityPathingMultiSectionSolver = class extends BaseSolver {
       console.warn(
         `Section solver failed for node ${this.currentSection.centerNodeId}. Error: ${this.sectionSolver.error}`
       );
+      this.stats.failedSectionSolvers++;
+      this.stats.failedOptimizations++;
       this.sectionSolver = null;
       this.activeSubSolver = null;
       return;
@@ -15771,7 +15845,7 @@ var AutoroutingPipelineSolver = class extends BaseSolver {
     super();
     this.srj = srj;
     this.opts = opts;
-    this.MAX_ITERATIONS = 1e7;
+    this.MAX_ITERATIONS = 1e8;
     if (opts.capacityDepth === void 0) {
       const boundsWidth = srj.bounds.maxX - srj.bounds.minX;
       const boundsHeight = srj.bounds.maxY - srj.bounds.minY;