p1

Author: AnasSarkiz

lib/solvers/FixedTopologyHighDensityIntraNodeSolver/FixedTopologyHighDensityIntraNodeSolver.ts

@@ -7,6 +7,7 @@ import {
   type ViaTile,
   ViaGraphSolver,
   createConvexViaGraphFromXYConnections,
+  viaTile as defaultViaTile,
 } from "@tscircuit/hypergraph"
 import { ConnectivityMap } from "circuit-json-to-connectivity-map"
 import type {
@@ -32,6 +33,7 @@ export interface FixedTopologyHighDensityIntraNodeSolverParams {
   nodeWithPortPoints: NodeWithPortPoints
   colorMap?: Record<string, string>
   traceWidth?: number
+  viaDiameter?: number
   connMap?: ConnectivityMap
 }
 
@@ -48,6 +50,8 @@ export class FixedTopologyHighDensityIntraNodeSolver extends BaseSolver {
   nodeWithPortPoints: NodeWithPortPoints
   colorMap: Record<string, string>
   traceWidth: number
+  viaDiameter: number
+  viaTile: ViaTile
   connMap?: ConnectivityMap
 
   rootConnectionNameByConnectionId: Map<string, string | undefined> = new Map()
@@ -63,6 +67,8 @@ export class FixedTopologyHighDensityIntraNodeSolver extends BaseSolver {
     this.nodeWithPortPoints = params.nodeWithPortPoints
     this.colorMap = params.colorMap ?? {}
     this.traceWidth = params.traceWidth ?? 0.15
+    this.viaTile = defaultViaTile
+    this.viaDiameter = this._resolveViaDiameter(params.viaDiameter)
     this.connMap = params.connMap
     this.MAX_ITERATIONS = 1e6
 
@@ -76,6 +82,24 @@ export class FixedTopologyHighDensityIntraNodeSolver extends BaseSolver {
     return this.constructorParams
   }
 
+  private _getViaTileDiameter(viaTile: ViaTile): number {
+    for (const vias of Object.values(viaTile.viasByNet)) {
+      if (vias.length > 0) return vias[0].diameter
+    }
+    return 0.3
+  }
+
+  private _resolveViaDiameter(requestedViaDiameter?: number): number {
+    const viaTileDiameter = this._getViaTileDiameter(this.viaTile)
+    if (
+      requestedViaDiameter !== undefined &&
+      Math.abs(requestedViaDiameter - viaTileDiameter) <= 1e-6
+    ) {
+      return requestedViaDiameter
+    }
+    return viaTileDiameter
+  }
+
   private _initializeGraph(): ViaGraphSolver | null {
     // Build connections from port points
     const connectionMap = new Map<
@@ -113,7 +137,15 @@ export class FixedTopologyHighDensityIntraNodeSolver extends BaseSolver {
     }
     if (inputConnections.length === 0) return null
 
-    const convexGraph = createConvexViaGraphFromXYConnections(inputConnections)
+    const convexGraph = createConvexViaGraphFromXYConnections(
+      inputConnections,
+      this.viaTile,
+      {
+        // Keep hypergraph's newer tile topology, but scale obstacle clearance
+        // up when autorouter trace widths are larger than the default baseline.
+        clearance: Math.max(0.1, this.traceWidth / 2),
+      },
+    )
     this.tiledViasByNet = convexGraph.viaTile.viasByNet ?? {}
 
     return new ViaGraphSolver({
@@ -541,7 +573,7 @@ export class FixedTopologyHighDensityIntraNodeSolver extends BaseSolver {
             ? Math.max(
                 ...routeViaRegions.map((viaRegion) => viaRegion.diameter),
               )
-            : 0.6,
+            : this.viaDiameter,
         route: routePoints,
         vias: routeVias,
         viaRegions: routeViaRegions,

lib/solvers/HighDensitySolver/HighDensityHyperParameters.ts

@@ -51,4 +51,6 @@ export interface HighDensityHyperParameters {
 
   // Minimum travel distance before allowing jumper neighbors
   MIN_TRAVEL_BEFORE_JUMPER?: number // mm - default: 3
+
+  FIXED_TOPOLOGY_HIGH_DENSITY_INTRA_NODE_SOLVER?: boolean
 }

lib/solvers/HyperHighDensitySolver/HyperSingleIntraNodeSolver.ts

@@ -15,12 +15,14 @@ import { SingleTransitionIntraNodeSolver } from "../HighDensitySolver/SingleTran
 import { MultiHeadPolyLineIntraNodeSolver2 } from "../HighDensitySolver/MultiHeadPolyLineIntraNodeSolver/MultiHeadPolyLineIntraNodeSolver2_Optimized"
 import { MultiHeadPolyLineIntraNodeSolver3 } from "../HighDensitySolver/MultiHeadPolyLineIntraNodeSolver/MultiHeadPolyLineIntraNodeSolver3_ViaPossibilitiesSolverIntegration"
 import { HighDensitySolverA01 } from "@tscircuit/high-density-a01"
+import { FixedTopologyHighDensityIntraNodeSolver } from "../FixedTopologyHighDensityIntraNodeSolver"
 
 export class HyperSingleIntraNodeSolver extends HyperParameterSupervisorSolver<
   | IntraNodeRouteSolver
   | TwoCrossingRoutesHighDensitySolver
   | SingleTransitionCrossingRouteSolver
   | SingleTransitionIntraNodeSolver
+  | FixedTopologyHighDensityIntraNodeSolver
 > {
   override getSolverName(): string {
     return "HyperSingleIntraNodeSolver"
@@ -53,6 +55,7 @@ export class HyperSingleIntraNodeSolver extends HyperParameterSupervisorSolver<
       ["closedFormSingleTrace"],
       // ["closedFormTwoTrace"],
       ["highDensityA01"],
+      ["fixedTopologyHighDensityIntraNodeSolver"],
     ]
   }
 
@@ -183,6 +186,14 @@ export class HyperSingleIntraNodeSolver extends HyperParameterSupervisorSolver<
           },
         ],
       },
+      {
+        name: "fixedTopologyHighDensityIntraNodeSolver",
+        possibleValues: [
+          {
+            FIXED_TOPOLOGY_HIGH_DENSITY_INTRA_NODE_SOLVER: true,
+          },
+        ],
+      },
     ]
   }
 
@@ -249,6 +260,15 @@ export class HyperSingleIntraNodeSolver extends HyperParameterSupervisorSolver<
         viaDiameter: this.constructorParams.viaDiameter,
       }) as any
     }
+    if (hyperParameters.FIXED_TOPOLOGY_HIGH_DENSITY_INTRA_NODE_SOLVER) {
+      return new FixedTopologyHighDensityIntraNodeSolver({
+        nodeWithPortPoints: this.nodeWithPortPoints,
+        connMap: this.connMap,
+        colorMap: this.constructorParams.colorMap,
+        viaDiameter: this.constructorParams.viaDiameter,
+        traceWidth: this.constructorParams.traceWidth,
+      }) as any
+    }
     return new CachedIntraNodeRouteSolver({
       ...this.constructorParams,
       hyperParameters,

lib/testing/utils/convertToCircuitJson.ts

@@ -397,6 +397,7 @@ function extractViasFromRoutes(
       // Extract vias from HighDensityRoutes by looking for layer changes
       ;(routes as HighDensityRoute[]).forEach((route, routeIndex) => {
         const traceId = `trace_${routeIndex}`
+        const viaDiameter = route.viaDiameter || minViaDiameter
         for (let i = 1; i < route.route.length; i++) {
           const prevPoint = route.route[i - 1]
           const currPoint = route.route[i]
@@ -418,8 +419,8 @@ function extractViasFromRoutes(
                 pcb_trace_id: traceId,
                 x: currPoint.x,
                 y: currPoint.y,
-                outer_diameter: minViaDiameter,
-                hole_diameter: minViaDiameter * 0.5,
+                outer_diameter: viaDiameter,
+                hole_diameter: viaDiameter * 0.5,
                 layers: [fromLayer, toLayer] as LayerName[],
               })
               viaLocations.add(locationKey)

package.json

@@ -28,7 +28,7 @@
     "@tscircuit/circuit-json-util": "^0.0.46",
     "@tscircuit/core": "^0.0.337",
     "@tscircuit/curvy-trace-solver": "^0.0.10",
-    "@tscircuit/hypergraph": "^0.0.36",
+    "@tscircuit/hypergraph": "^0.0.50",
     "@tscircuit/jumper-topology-generator": "^0.0.4",
     "@tscircuit/math-utils": "^0.0.27",
     "@tscircuit/rectdiff": "0.0.22",