@tscircuit/schematic-trace-solver 0.0.40 → 0.0.42

package/lib/solvers/TraceLabelOverlapAvoidanceSolver/trySnipAndReconnect.ts

@@ -1,32 +1,26 @@
 import type { Point } from "@tscircuit/math-utils"
-import { getRectBounds } from "../NetLabelPlacementSolver/SingleNetLabelPlacementSolver/geometry"
 import type { SolvedTracePath } from "../SchematicTraceLinesSolver/SchematicTraceLinesSolver"
-import {
-  isPathCollidingWithObstacles,
-  isVertical,
-  segmentIntersectsRect,
-} from "../SchematicTraceLinesSolver/SchematicTraceSingleLineSolver2/collisions"
-import type { NetLabelPlacement } from "../NetLabelPlacementSolver/NetLabelPlacementSolver"
-import { simplifyPath } from "./simplifyPath"
 
-export const trySnipAndReconnect = ({
+export const generateSnipAndReconnectCandidates = ({
   initialTrace,
   firstInsideIndex,
   lastInsideIndex,
   labelBounds,
-  obstacles,
+  paddingBuffer,
+  detourCount,
 }: {
   initialTrace: SolvedTracePath
   firstInsideIndex: number
   lastInsideIndex: number
   labelBounds: any
-  obstacles: any[]
-}): SolvedTracePath | null => {
+  paddingBuffer: number
+  detourCount: number
+}): Point[][] => {
   if (
     firstInsideIndex <= 0 ||
     lastInsideIndex >= initialTrace.tracePath.length - 1
   ) {
-    return null
+    return []
   }
 
   const entryPoint = initialTrace.tracePath[firstInsideIndex - 1]
@@ -35,32 +29,19 @@ export const trySnipAndReconnect = ({
   const pathToEntry = initialTrace.tracePath.slice(0, firstInsideIndex)
   const pathFromExit = initialTrace.tracePath.slice(lastInsideIndex + 1)
 
-  const candidateDetours: Point[][] = []
+  const allCandidateDetours: Point[][] = []
 
+  // Candidate type 1: simple elbow
   if (entryPoint.x !== exitPoint.x && entryPoint.y !== exitPoint.y) {
-    candidateDetours.push([{ x: exitPoint.x, y: entryPoint.y }])
-    candidateDetours.push([{ x: entryPoint.x, y: exitPoint.y }])
+    allCandidateDetours.push([{ x: exitPoint.x, y: entryPoint.y }])
+    allCandidateDetours.push([{ x: entryPoint.x, y: exitPoint.y }])
   } else if (entryPoint.x === exitPoint.x || entryPoint.y === exitPoint.y) {
-    const newPath = [...pathToEntry, ...pathFromExit]
-    const simplified = simplifyPath(newPath)
-    if (!isPathCollidingWithObstacles(simplified, obstacles)) {
-      return { ...initialTrace, tracePath: simplified }
-    }
+    // Candidate type 2: direct connection (if points are aligned)
+    allCandidateDetours.push([]) // No detour points needed
   }
 
-  for (let i = 0; i < candidateDetours.length; i++) {
-    const detour = candidateDetours[i]
-    const newFullPath = [...pathToEntry, ...detour, ...pathFromExit]
-    const simplified = simplifyPath(newFullPath)
-
-    if (!isPathCollidingWithObstacles(simplified, obstacles)) {
-      return { ...initialTrace, tracePath: simplified }
-    }
-  }
-
-  candidateDetours.length = 0
-
-  const buffer = 0.1
+  // Candidate type 3: routing around the label bounds
+  const buffer = paddingBuffer + detourCount * paddingBuffer
   const leftX = labelBounds.minX - buffer
   const rightX = labelBounds.maxX + buffer
   const topY = labelBounds.maxY + buffer
@@ -71,7 +52,7 @@ export const trySnipAndReconnect = ({
     entryPoint.x < labelBounds.maxX &&
     exitPoint.x < labelBounds.maxX
   ) {
-    candidateDetours.push([
+    allCandidateDetours.push([
       { x: leftX, y: entryPoint.y },
       { x: leftX, y: exitPoint.y },
     ])
@@ -82,7 +63,7 @@ export const trySnipAndReconnect = ({
     entryPoint.x > labelBounds.minX &&
     exitPoint.x > labelBounds.minX
   ) {
-    candidateDetours.push([
+    allCandidateDetours.push([
       { x: rightX, y: entryPoint.y },
       { x: rightX, y: exitPoint.y },
     ])
@@ -93,7 +74,7 @@ export const trySnipAndReconnect = ({
     entryPoint.y > labelBounds.minY &&
     exitPoint.y > labelBounds.minY
   ) {
-    candidateDetours.push([
+    allCandidateDetours.push([
       { x: entryPoint.x, y: topY },
       { x: exitPoint.x, y: topY },
     ])
@@ -104,126 +85,15 @@ export const trySnipAndReconnect = ({
     entryPoint.y < labelBounds.maxY &&
     exitPoint.y < labelBounds.maxY
   ) {
-    candidateDetours.push([
+    allCandidateDetours.push([
       { x: entryPoint.x, y: bottomY },
       { x: exitPoint.x, y: bottomY },
     ])
   }
 
-  for (let i = 0; i < candidateDetours.length; i++) {
-    const detour = candidateDetours[i]
-    const newFullPath = [...pathToEntry, ...detour, ...pathFromExit]
-    const simplified = simplifyPath(newFullPath)
-
-    if (!isPathCollidingWithObstacles(simplified, obstacles)) {
-      return { ...initialTrace, tracePath: simplified }
-    }
-  }
-
-  return null
-}
-
-export const tryFourPointDetour = ({
-  initialTrace,
-  label,
-  labelBounds,
-  obstacles,
-  paddingBuffer,
-  detourCount,
-}: {
-  initialTrace: SolvedTracePath
-  label: NetLabelPlacement
-  labelBounds: any
-  obstacles: any[]
-  paddingBuffer: number
-  detourCount: number
-}): SolvedTracePath | null => {
-  let collidingSegIndex = -1
-  for (let i = 0; i < initialTrace.tracePath.length - 1; i++) {
-    if (
-      segmentIntersectsRect(
-        initialTrace.tracePath[i],
-        initialTrace.tracePath[i + 1],
-        labelBounds,
-      )
-    ) {
-      collidingSegIndex = i
-      break
-    }
-  }
-
-  if (collidingSegIndex === -1) return initialTrace
-
-  const pA = initialTrace.tracePath[collidingSegIndex]
-  const pB = initialTrace.tracePath[collidingSegIndex + 1]
-
-  if (!pA || !pB) return null
-
-  const candidateDetours: Point[][] = []
-  const paddedLabelBounds = getRectBounds(
-    label.center,
-    label.width,
-    label.height,
-  )
-
-  const effectivePadding = paddingBuffer + detourCount * paddingBuffer
-
-  if (isVertical(pA, pB)) {
-    const xCandidates = [
-      paddedLabelBounds.maxX + effectivePadding,
-      paddedLabelBounds.minX - effectivePadding,
-    ]
-    for (const newX of xCandidates) {
-      candidateDetours.push(
-        pB.y > pA.y
-          ? [
-              { x: pA.x, y: paddedLabelBounds.minY - effectivePadding },
-              { x: newX, y: paddedLabelBounds.minY - effectivePadding },
-              { x: newX, y: paddedLabelBounds.maxY + effectivePadding },
-              { x: pB.x, y: paddedLabelBounds.maxY + effectivePadding },
-            ]
-          : [
-              { x: pA.x, y: paddedLabelBounds.maxY + effectivePadding },
-              { x: newX, y: paddedLabelBounds.maxY + effectivePadding },
-              { x: newX, y: paddedLabelBounds.minY - effectivePadding },
-              { x: pB.x, y: paddedLabelBounds.minY - effectivePadding },
-            ],
-      )
-    }
-  } else {
-    const yCandidates = [
-      paddedLabelBounds.maxY + effectivePadding,
-      paddedLabelBounds.minY - effectivePadding,
-    ]
-    for (const newY of yCandidates) {
-      candidateDetours.push(
-        pB.x > pA.x
-          ? [
-              { x: paddedLabelBounds.minX - effectivePadding, y: pA.y },
-              { x: paddedLabelBounds.minX - effectivePadding, y: newY },
-              { x: paddedLabelBounds.maxX + effectivePadding, y: newY },
-              { x: paddedLabelBounds.maxX + effectivePadding, y: pB.y },
-            ]
-          : [
-              { x: paddedLabelBounds.maxX + effectivePadding, y: pA.y },
-              { x: paddedLabelBounds.maxX + effectivePadding, y: newY },
-              { x: paddedLabelBounds.minX - effectivePadding, y: newY },
-              { x: paddedLabelBounds.minX - effectivePadding, y: pB.y },
-            ],
-      )
-    }
-  }
-
-  for (const detourPoints of candidateDetours) {
-    const finalPath = [
-      ...initialTrace.tracePath.slice(0, collidingSegIndex + 1),
-      ...detourPoints,
-      ...initialTrace.tracePath.slice(collidingSegIndex + 1),
-    ]
-    const simplifiedFinalPath = simplifyPath(finalPath)
-    if (!isPathCollidingWithObstacles(simplifiedFinalPath, obstacles)) {
-      return { ...initialTrace, tracePath: simplifiedFinalPath }
-    }
-  }
-  return null
+  return allCandidateDetours.map((detour) => [
+    ...pathToEntry,
+    ...detour,
+    ...pathFromExit,
+  ])
 }

package/lib/utils/does-trace-overlap-with-existing-traces.ts

@@ -0,0 +1,33 @@
+import type { Point } from "@tscircuit/math-utils"
+import type { SolvedTracePath } from "../solvers/SchematicTraceLinesSolver/SchematicTraceLinesSolver"
+import { doSegmentsIntersect } from "@tscircuit/math-utils"
+
+export function doesTraceOverlapWithExistingTraces(
+  newTracePath: Point[],
+  existingTraces: SolvedTracePath[],
+): boolean {
+  for (let i = 0; i < newTracePath.length - 1; i++) {
+    const newSegmentP1 = newTracePath[i]
+    const newSegmentP2 = newTracePath[i + 1]
+
+    for (const existingTrace of existingTraces) {
+      for (let j = 0; j < existingTrace.tracePath.length - 1; j++) {
+        const existingSegmentP1 = existingTrace.tracePath[j]
+        const existingSegmentP2 = existingTrace.tracePath[j + 1]
+
+        if (
+          doSegmentsIntersect(
+            newSegmentP1,
+            newSegmentP2,
+            existingSegmentP1,
+            existingSegmentP2,
+          )
+        ) {
+          return true // Found an intersection
+        }
+      }
+    }
+  }
+
+  return false // No intersections found
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/schematic-trace-solver",
   "main": "dist/index.js",
-  "version": "0.0.40",
+  "version": "0.0.42",
   "type": "module",
   "scripts": {
     "start": "cosmos",

package/site/examples/example25.page.tsx

@@ -0,0 +1,4 @@
+import { PipelineDebugger } from "site/components/PipelineDebugger"
+import inputProblem from "../../tests/assets/example25.json"
+
+export default () => <PipelineDebugger inputProblem={inputProblem as any} />

package/tests/assets/1.input.json

@@ -0,0 +1,379 @@
+{
+  "mergedNetLabelObstacleSolver": {
+    "netLabelPlacements": [
+      {
+        "globalConnNetId": "connectivity_net0",
+        "dcConnNetId": "connectivity_net0",
+        "netId": "GND",
+        "mspConnectionPairIds": ["U1.1-J1.3"],
+        "pinIds": ["U1.1", "J1.3"],
+        "orientation": "y-",
+        "anchorPoint": {
+          "x": 1.4000000000000001,
+          "y": -2.295
+        },
+        "width": 0.2,
+        "height": 0.45,
+        "center": {
+          "x": 1.4000000000000001,
+          "y": -2.52
+        }
+      },
+      {
+        "globalConnNetId": "connectivity_net1",
+        "netId": "VCC",
+        "mspConnectionPairIds": [],
+        "pinIds": ["U1.8"],
+        "orientation": "x+",
+        "anchorPoint": {
+          "x": 1.2000000000000002,
+          "y": 0.30000000000000004
+        },
+        "width": 0.45,
+        "height": 0.2,
+        "center": {
+          "x": 1.4260000000000002,
+          "y": 0.30000000000000004
+        }
+      },
+      {
+        "globalConnNetId": "connectivity_net1",
+        "netId": "VCC",
+        "mspConnectionPairIds": [],
+        "pinIds": ["J1.1"],
+        "orientation": "x-",
+        "anchorPoint": {
+          "x": 1.6,
+          "y": -1.895
+        },
+        "width": 0.45,
+        "height": 0.2,
+        "center": {
+          "x": 1.374,
+          "y": -1.895
+        }
+      },
+      {
+        "globalConnNetId": "connectivity_net2",
+        "netId": "MMM",
+        "mspConnectionPairIds": [],
+        "pinIds": ["J1.2"],
+        "orientation": "x-",
+        "anchorPoint": {
+          "x": 1.6,
+          "y": -2.095
+        },
+        "width": 0.45,
+        "height": 0.2,
+        "center": {
+          "x": 1.374,
+          "y": -2.095
+        }
+      }
+    ],
+    "inputProblem": {
+      "chips": [
+        {
+          "chipId": "schematic_component_0",
+          "center": {
+            "x": 0,
+            "y": 0
+          },
+          "width": 2.4000000000000004,
+          "height": 1,
+          "pins": [
+            {
+              "pinId": "U1.1",
+              "x": 1.2000000000000002,
+              "y": -0.30000000000000004
+            },
+            {
+              "pinId": "U1.2",
+              "x": -1.2000000000000002,
+              "y": -0.30000000000000004
+            },
+            {
+              "pinId": "U1.3",
+              "x": 1.2000000000000002,
+              "y": 0.09999999999999998
+            },
+            {
+              "pinId": "U1.4",
+              "x": -1.2000000000000002,
+              "y": 0.30000000000000004
+            },
+            {
+              "pinId": "U1.5",
+              "x": -1.2000000000000002,
+              "y": 0.10000000000000003
+            },
+            {
+              "pinId": "U1.6",
+              "x": -1.2000000000000002,
+              "y": -0.09999999999999998
+            },
+            {
+              "pinId": "U1.7",
+              "x": 1.2000000000000002,
+              "y": -0.10000000000000003
+            },
+            {
+              "pinId": "U1.8",
+              "x": 1.2000000000000002,
+              "y": 0.30000000000000004
+            }
+          ]
+        },
+        {
+          "chipId": "schematic_component_1",
+          "center": {
+            "x": 2.7,
+            "y": -2.095
+          },
+          "width": 2.2,
+          "height": 0.8,
+          "pins": [
+            {
+              "pinId": "J1.1",
+              "x": 1.6,
+              "y": -1.895
+            },
+            {
+              "pinId": "J1.2",
+              "x": 1.6,
+              "y": -2.095
+            },
+            {
+              "pinId": "J1.3",
+              "x": 1.6,
+              "y": -2.295
+            }
+          ]
+        }
+      ],
+      "directConnections": [],
+      "netConnections": [
+        {
+          "netId": "GND",
+          "pinIds": ["U1.1", "J1.3"]
+        },
+        {
+          "netId": "VCC",
+          "pinIds": ["U1.8", "J1.1"]
+        },
+        {
+          "netId": "MMM",
+          "pinIds": ["J1.2"]
+        }
+      ],
+      "availableNetLabelOrientations": {
+        "VCC": ["y-"],
+        "OUT": ["x-", "x+"],
+        "GND": ["y-"],
+        "MMM": ["x+", "x-"]
+      },
+      "maxMspPairDistance": 2.4
+    },
+    "traces": [
+      {
+        "mspPairId": "U1.1-J1.3",
+        "dcConnNetId": "connectivity_net0",
+        "globalConnNetId": "connectivity_net0",
+        "userNetId": "GND",
+        "pins": [
+          {
+            "pinId": "U1.1",
+            "x": 1.2000000000000002,
+            "y": -0.30000000000000004,
+            "chipId": "schematic_component_0",
+            "_facingDirection": "x+"
+          },
+          {
+            "pinId": "J1.3",
+            "x": 1.6,
+            "y": -2.295,
+            "chipId": "schematic_component_1",
+            "_facingDirection": "x-"
+          }
+        ],
+        "tracePath": [
+          {
+            "x": 1.2000000000000002,
+            "y": -0.30000000000000004
+          },
+          {
+            "x": 1.4000000000000001,
+            "y": -0.30000000000000004
+          },
+          {
+            "x": 1.4000000000000001,
+            "y": -1.2974999999999999
+          },
+          {
+            "x": 1.4000000000000001,
+            "y": -2.295
+          },
+          {
+            "x": 1.6,
+            "y": -2.295
+          }
+        ],
+        "mspConnectionPairIds": ["U1.1-J1.3"],
+        "pinIds": ["U1.1", "J1.3"]
+      }
+    ]
+  },
+  "netLabelPlacementSolver": {
+    "inputProblem": {
+      "chips": [
+        {
+          "chipId": "schematic_component_0",
+          "center": {
+            "x": 0,
+            "y": 0
+          },
+          "width": 2.4000000000000004,
+          "height": 1,
+          "pins": [
+            {
+              "pinId": "U1.1",
+              "x": 1.2000000000000002,
+              "y": -0.30000000000000004
+            },
+            {
+              "pinId": "U1.2",
+              "x": -1.2000000000000002,
+              "y": -0.30000000000000004
+            },
+            {
+              "pinId": "U1.3",
+              "x": 1.2000000000000002,
+              "y": 0.09999999999999998
+            },
+            {
+              "pinId": "U1.4",
+              "x": -1.2000000000000002,
+              "y": 0.30000000000000004
+            },
+            {
+              "pinId": "U1.5",
+              "x": -1.2000000000000002,
+              "y": 0.10000000000000003
+            },
+            {
+              "pinId": "U1.6",
+              "x": -1.2000000000000002,
+              "y": -0.09999999999999998
+            },
+            {
+              "pinId": "U1.7",
+              "x": 1.2000000000000002,
+              "y": -0.10000000000000003
+            },
+            {
+              "pinId": "U1.8",
+              "x": 1.2000000000000002,
+              "y": 0.30000000000000004
+            }
+          ]
+        },
+        {
+          "chipId": "schematic_component_1",
+          "center": {
+            "x": 2.7,
+            "y": -2.095
+          },
+          "width": 2.2,
+          "height": 0.8,
+          "pins": [
+            {
+              "pinId": "J1.1",
+              "x": 1.6,
+              "y": -1.895
+            },
+            {
+              "pinId": "J1.2",
+              "x": 1.6,
+              "y": -2.095
+            },
+            {
+              "pinId": "J1.3",
+              "x": 1.6,
+              "y": -2.295
+            }
+          ]
+        }
+      ],
+      "directConnections": [],
+      "netConnections": [
+        {
+          "netId": "GND",
+          "pinIds": ["U1.1", "J1.3"]
+        },
+        {
+          "netId": "VCC",
+          "pinIds": ["U1.8", "J1.1"]
+        },
+        {
+          "netId": "MMM",
+          "pinIds": ["J1.2"]
+        }
+      ],
+      "availableNetLabelOrientations": {
+        "VCC": ["y-"],
+        "OUT": ["x-", "x+"],
+        "GND": ["y-"],
+        "MMM": ["x+", "x-"]
+      },
+      "maxMspPairDistance": 2.4
+    },
+    "inputTraceMap": {
+      "U1.1-J1.3": {
+        "mspPairId": "U1.1-J1.3",
+        "dcConnNetId": "connectivity_net0",
+        "globalConnNetId": "connectivity_net0",
+        "userNetId": "GND",
+        "pins": [
+          {
+            "pinId": "U1.1",
+            "x": 1.2000000000000002,
+            "y": -0.30000000000000004,
+            "chipId": "schematic_component_0",
+            "_facingDirection": "x+"
+          },
+          {
+            "pinId": "J1.3",
+            "x": 1.6,
+            "y": -2.295,
+            "chipId": "schematic_component_1",
+            "_facingDirection": "x-"
+          }
+        ],
+        "tracePath": [
+          {
+            "x": 1.2000000000000002,
+            "y": -0.30000000000000004
+          },
+          {
+            "x": 1.4000000000000001,
+            "y": -0.30000000000000004
+          },
+          {
+            "x": 1.4000000000000001,
+            "y": -1.2974999999999999
+          },
+          {
+            "x": 1.4000000000000001,
+            "y": -2.295
+          },
+          {
+            "x": 1.6,
+            "y": -2.295
+          }
+        ],
+        "mspConnectionPairIds": ["U1.1-J1.3"],
+        "pinIds": ["U1.1", "J1.3"]
+      }
+    }
+  }
+}