@tscircuit/fanout-solver 0.0.14 → 0.0.16

package/README.md

@@ -198,6 +198,31 @@ parameters. Each sample has one shared boundary around all of its footprints,
 and component bounds come from the exact footprinter-generated copper pad
 extents.
 
+## SRJ19 benchmark
+
+The repository also loads all 200 samples from
+[`tscircuit/dataset-srj19`](https://github.com/tscircuit/dataset-srj19) as a
+pinned development dependency. The adapter keeps the complete obstacle field
+but selects only connections that touch the BGA, producing progressively larger
+two-layer fanout problems with opposite-layer passive overlays.
+
+Run the full benchmark with:
+
+```sh
+./benchmark.sh
+```
+
+Use `--sample sample001`, `--limit 10`, or
+`--max-layer-combinations 16` for shorter runs. Partial solutions are reported
+as benchmark results instead of failing the command, making current completion
+rates a baseline for solver improvements. `bun run benchmark:srj19` is an alias
+for the same command.
+
+Run `bun run start` and open the `datasets/srj19` Cosmos fixture to step the
+selected sample through `GenericSolverDebugger`. The page has Previous/Next,
+sample dropdown, and range controls and stores the selection in the `sample`
+URL parameter.
+
 ## Dataset 02
 
 `datasets/dataset02.ts` is the four-layer BGA400 stress benchmark. It routes

package/lib/route-bus.ts

@@ -12,6 +12,7 @@ import {
 } from "./geometry"
 import { getLayerSpan } from "./layer-names"
 import type {
+  Bounds,
   FanoutDirection,
   FanoutRoutePlan,
   Point2D,
@@ -147,6 +148,23 @@ function getConnectionRank(
   return connectionRank
 }
 
+function getRoutableBounds(
+  srjBounds: SimpleRouteJson["bounds"],
+  sharedBoundary: Bounds,
+): SimpleRouteJson["bounds"] {
+  // Fanout routes must reach the shared boundary and terminate exactly on it.
+  // When that boundary sits outside srj.bounds -- which is what
+  // fanoutBoundaryPadding does, since it pads the boundary without widening
+  // the routing area -- containment has to follow the boundary, or every plan
+  // is rejected before its geometry is ever considered.
+  return {
+    minX: Math.min(srjBounds.minX, sharedBoundary.minX),
+    maxX: Math.max(srjBounds.maxX, sharedBoundary.maxX),
+    minY: Math.min(srjBounds.minY, sharedBoundary.minY),
+    maxY: Math.max(srjBounds.maxY, sharedBoundary.maxY),
+  }
+}
+
 function pointIsInsideBounds(
   point: Point2D,
   bounds: SimpleRouteJson["bounds"],
@@ -668,15 +686,17 @@ function planIsClear(params: {
   plan: FanoutRoutePlan
   otherPlans: FanoutRoutePlan[]
   srj: SimpleRouteJson
+  sharedBoundary: Bounds
   clearance: number
 }): boolean {
-  const { plan, otherPlans, srj, clearance } = params
+  const { plan, otherPlans, srj, sharedBoundary, clearance } = params
+  const routableBounds = getRoutableBounds(srj.bounds, sharedBoundary)
   if (
-    !pointIsInsideBounds(plan.exitPoint, srj.bounds) ||
+    !pointIsInsideBounds(plan.exitPoint, routableBounds) ||
     plan.segments.some(
       (segment) =>
-        !pointIsInsideBounds(segment.start, srj.bounds) ||
-        !pointIsInsideBounds(segment.end, srj.bounds),
+        !pointIsInsideBounds(segment.start, routableBounds) ||
+        !pointIsInsideBounds(segment.end, routableBounds),
     )
   ) {
     return false
@@ -814,6 +834,7 @@ function routePlaneTerminatedBus(
             plan,
             otherPlans: [...acceptedPlans, ...candidatePlans],
             srj,
+            sharedBoundary: bus.sharedBoundary,
             clearance,
           })
         ) {
@@ -913,6 +934,7 @@ export function routeBus(params: RouteBusParams): FanoutRoutePlan[] | null {
               plan,
               otherPlans: [...acceptedPlans, ...candidatePlans],
               srj,
+              sharedBoundary: bus.sharedBoundary,
               clearance,
             })
           ) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/fanout-solver",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "description": "BGA fanout solver with coordinated bus-layer escapes for SimpleRouteJson",
   "module": "lib/index.ts",
   "type": "module",
@@ -28,6 +28,7 @@
     "typecheck": "bunx tsc --noEmit",
     "test": "bun test",
     "benchmark": "bun benchmarks/run-benchmark.ts",
+    "benchmark:srj19": "./benchmark.sh",
     "render:dataset": "bun scripts/render-dataset-pngs.ts",
     "format": "biome format --write .",
     "format:check": "biome format ."
@@ -39,10 +40,12 @@
   },
   "devDependencies": {
     "@biomejs/biome": "2.5.5",
+    "@tsci/tscircuit.dataset-srj19-bga-passive-overlays": "github:tscircuit/dataset-srj19#c1206f3",
     "@tscircuit/footprinter": "0.0.394",
     "@types/bun": "1.3.14",
     "@types/react": "19.2.14",
     "@types/react-dom": "19.2.3",
+    "bun-match-svg": "^0.0.15",
     "circuit-json": "0.0.455",
     "react": "19.2.8",
     "react-cosmos": "7.3.0",