Merge pull request #38 from tscircuit/small-cell

seveibar · web-flow · commit 984b628e7115 · 2025-03-10T13:43:44.000-07:00
fix high density routing issues where smaller cell sizes weren't working
diff --git a/examples/bug-reproductions/corebug1.fixture.tsx b/examples/bug-reproductions/corebug1.fixture.tsx
@@ -1,5 +1,5 @@
 import { RootCircuit, SimpleRouteJson } from "@tscircuit/core"
-import { CapacityMeshPipelineDebugger } from "lib/testing/CapacityMeshPipelineDebugger"
+import { CapacityMeshPipelineDebugger } from "lib/testing/AutoroutingPipelineDebugger"
 import { useMemo, useState } from "react"
 import { Fragment } from "react/jsx-runtime"
 import { CapacityMeshAutorouterCoreBinding } from "tests/fixtures/CapacityMeshAutorouterCoreBinding"
diff --git a/examples/bug-reproductions/corebug2.fixture.tsx b/examples/bug-reproductions/corebug2.fixture.tsx
@@ -1,5 +1,5 @@
 import { RootCircuit, SimpleRouteJson } from "@tscircuit/core"
-import { CapacityMeshPipelineDebugger } from "lib/testing/CapacityMeshPipelineDebugger"
+import { CapacityMeshPipelineDebugger } from "lib/testing/AutoroutingPipelineDebugger"
 import { useMemo, useState } from "react"
 import { Fragment } from "react/jsx-runtime"
 import { CapacityMeshAutorouterCoreBinding } from "tests/fixtures/CapacityMeshAutorouterCoreBinding"
diff --git a/examples/bug-reproductions/layerbug1.fixture.tsx b/examples/bug-reproductions/layerbug1.fixture.tsx
@@ -1,4 +1,4 @@
-import { CapacityMeshPipelineDebugger } from "lib/testing/CapacityMeshPipelineDebugger"
+import { CapacityMeshPipelineDebugger } from "lib/testing/AutoroutingPipelineDebugger"
 import boardWithTopAndBottom from "examples/assets/boardwithtopandbottom.json"
 
 export default () => {
diff --git a/examples/end-to-end/e2e1.fixture.tsx b/examples/end-to-end/e2e1.fixture.tsx
@@ -1,4 +1,4 @@
-import { CapacityMeshPipelineDebugger } from "lib/testing/CapacityMeshPipelineDebugger"
+import { CapacityMeshPipelineDebugger } from "lib/testing/AutoroutingPipelineDebugger"
 import { SimpleRouteJson } from "lib/types"
 
 const simpleRouteJson: SimpleRouteJson = {
diff --git a/examples/end-to-end/e2e2.fixture.tsx b/examples/end-to-end/e2e2.fixture.tsx
@@ -1,4 +1,4 @@
-import { CapacityMeshPipelineDebugger } from "lib/testing/CapacityMeshPipelineDebugger"
+import { CapacityMeshPipelineDebugger } from "lib/testing/AutoroutingPipelineDebugger"
 import { SimpleRouteJson } from "lib/types"
 import simpleRouteJson from "examples/assets/e2e2.json"
 
diff --git a/examples/end-to-end/e2e3.fixture.tsx b/examples/end-to-end/e2e3.fixture.tsx
@@ -1,4 +1,4 @@
-import { CapacityMeshPipelineDebugger } from "lib/testing/CapacityMeshPipelineDebugger"
+import { CapacityMeshPipelineDebugger } from "lib/testing/AutoroutingPipelineDebugger"
 import { SimpleRouteJson } from "lib/types"
 import simpleRouteJson from "examples/assets/e2e3.json"
 
diff --git a/examples/end-to-end/e2e4.fixture.tsx b/examples/end-to-end/e2e4.fixture.tsx
@@ -1,4 +1,4 @@
-import { CapacityMeshPipelineDebugger } from "lib/testing/CapacityMeshPipelineDebugger"
+import { CapacityMeshPipelineDebugger } from "lib/testing/AutoroutingPipelineDebugger"
 import { SimpleRouteJson } from "lib/types"
 import simpleRouteJson from "examples/assets/e2e4.json"
 
diff --git a/examples/end-to-end/e2e5.fixture.tsx b/examples/end-to-end/e2e5.fixture.tsx
@@ -1,4 +1,4 @@
-import { CapacityMeshPipelineDebugger } from "lib/testing/CapacityMeshPipelineDebugger"
+import { CapacityMeshPipelineDebugger } from "lib/testing/AutoroutingPipelineDebugger"
 import { SimpleRouteJson } from "lib/types"
 import simpleRouteJson from "examples/assets/e2e5.json"
 
diff --git a/examples/high-density-suite/highdensitysuite1.fixture.tsx b/examples/high-density-suite/highdensitysuite1.fixture.tsx
@@ -0,0 +1,13 @@
+import highdensitysuite1 from "tests/high-density-suite/assets/highdensitysuite1.json"
+import { IntraNodeRouteSolver } from "lib/solvers/HighDensitySolver/IntraNodeSolver"
+import { SingleHighDensityRouteSolver } from "lib/solvers/HighDensitySolver/SingleHighDensityRouteSolver"
+import { GenericSolverDebugger } from "lib/testing/GenericSolverDebugger"
+import { HyperHighDensityDebugger } from "lib/testing/HyperHighDensityDebugger"
+
+export default () => {
+  return (
+    <HyperHighDensityDebugger
+      nodeWithPortPoints={highdensitysuite1.nodeWithPortPoints}
+    />
+  )
+}
diff --git a/examples/keyboards/keyboard1.fixture.tsx b/examples/keyboards/keyboard1.fixture.tsx
@@ -1,4 +1,4 @@
-import { CapacityMeshPipelineDebugger } from "lib/testing/CapacityMeshPipelineDebugger"
+import { CapacityMeshPipelineDebugger } from "lib/testing/AutoroutingPipelineDebugger"
 import gkSample95 from "examples/assets/growing-grid-keyboard-sample-sample95-unrouted_simple_route.json"
 import type { SimpleRouteJson } from "lib/types"
 
diff --git a/examples/keyboards/keyboard3.fixture.tsx b/examples/keyboards/keyboard3.fixture.tsx
@@ -1,4 +1,4 @@
-import { CapacityMeshPipelineDebugger } from "lib/testing/CapacityMeshPipelineDebugger"
+import { CapacityMeshPipelineDebugger } from "lib/testing/AutoroutingPipelineDebugger"
 import keyboard3 from "examples/assets/keyboard3.json"
 import type { SimpleRouteJson } from "lib/types"
 
diff --git a/lib/solvers/CapacityMeshSolver/CapacitySegmentToPointSolver.ts b/lib/solvers/CapacityMeshSolver/CapacitySegmentToPointSolver.ts
@@ -178,7 +178,10 @@ export class CapacitySegmentToPointSolver extends BaseSolver {
         seg.assignedPoints.map((ap) => ({
           x: ap.point.x,
           y: ap.point.y,
-          label: `${seg.capacityMeshNodeId}-${ap.connectionName}`,
+          label: [
+            `${seg.capacityMeshNodeId}-${ap.connectionName}`,
+            `z: ${seg.availableZ.join(",")}`,
+          ].join("\n"),
           color: this.colorMap[ap.connectionName],
           step: 4,
         })),
diff --git a/lib/solvers/HighDensitySolver/SingleHighDensityRouteSolver.ts b/lib/solvers/HighDensitySolver/SingleHighDensityRouteSolver.ts
@@ -221,8 +221,11 @@ export class SingleHighDensityRouteSolver extends BaseSolver {
       node.y < this.bounds.minY + margin ||
       node.y > this.bounds.maxY - margin
     if (tooClose && !isVia) {
-      // If it's close to B, it's an exception
-      if (distance(node, this.B) < margin * 2) {
+      // If it's close to B or A it's an exception
+      if (
+        distance(node, this.B) < margin * 2 ||
+        distance(node, this.A) < margin * 2
+      ) {
         return false
       }
     }
diff --git a/lib/testing/AutoroutingPipelineDebugger.tsx b/lib/testing/AutoroutingPipelineDebugger.tsx
@@ -342,11 +342,11 @@ export const CapacityMeshPipelineDebugger = ({
                           // Get the node with port points from the segmentToPointOptimizer
                           let nodeWithPortPoints = null
                           if (
-                            solver.segmentToPointOptimizer
+                            solver.unravelMultiSectionSolver
                               ?.getNodesWithPortPoints
                           ) {
-                            nodeWithPortPoints = solver.segmentToPointOptimizer
-                              .getNodesWithPortPoints()
+                            nodeWithPortPoints = solver
+                              .unravelMultiSectionSolver!.getNodesWithPortPoints()
                               .find((n) => n.capacityMeshNodeId === nodeId)
                           }
 
diff --git a/tests/__snapshots__/e2e1.snap.svg b/tests/__snapshots__/e2e1.snap.svg
diff --git a/tests/high-density-suite/assets/highdensitysuite1.json b/tests/high-density-suite/assets/highdensitysuite1.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { CapacityMeshPipelineDebugger } from "lib/testing/CapacityMeshPipelineDebugger"`
	`1`	`+import { CapacityMeshPipelineDebugger } from "lib/testing/AutoroutingPipelineDebugger"`
`2`	`2`	`import boardWithTopAndBottom from "examples/assets/boardwithtopandbottom.json"`
`3`	`3`
`4`	`4`	`export default () => {`