@tscircuit/schematic-trace-solver 0.0.182 → 0.0.183

package/lib/solvers/TraceCleanupSolver/minimizeTurnsWithFilteredLabels.ts

@@ -11,6 +11,39 @@ import {
 } from "./sameNetRailAlignment/geometry"
 import { shortenExcessiveLabelPaddingDetour } from "./shortenExcessiveLabelPaddingDetour"
 
+const PATH_LENGTH_EPSILON = 1e-9
+type ObstacleBounds = {
+  minX: number
+  minY: number
+  maxX: number
+  maxY: number
+}
+
+const getPathLength = (path: SolvedTracePath["tracePath"]): number =>
+  path.slice(1).reduce((length, point, pointIndex) => {
+    const previousPoint = path[pointIndex]!
+    return (
+      length +
+      Math.abs(point.x - previousPoint.x) +
+      Math.abs(point.y - previousPoint.y)
+    )
+  }, 0)
+
+const chooseLengthPreservingBoundaryRoute = ({
+  strictPath,
+  boundaryPath,
+}: {
+  strictPath: SolvedTracePath["tracePath"]
+  boundaryPath: SolvedTracePath["tracePath"]
+}) => {
+  const doesNotAddTurns = countTurns(boundaryPath) <= countTurns(strictPath)
+  const preservesLength =
+    Math.abs(getPathLength(boundaryPath) - getPathLength(strictPath)) <=
+    PATH_LENGTH_EPSILON
+
+  return doesNotAddTurns && preservesLength ? boundaryPath : strictPath
+}
+
 /**
  * Minimizes turns with a strict pass that treats every other trace as an
  * obstacle and a relaxed pass that permits joining endpoint-sharing same-net
@@ -95,22 +128,36 @@ export const minimizeTurnsWithFilteredLabels = ({
     maxY: nl.center.y + nl.height / 2 + paddingBuffer,
   }))
 
-  const strictPath = minimizeTurns({
-    path: originalPath,
-    obstacles: [...staticObstacles, ...getTraceObstacles(otherTraces)],
-    labelBounds,
-    originalPath: originalPath,
-  })
+  const minimizeForObstacles = (obstacles: ObstacleBounds[]) => {
+    const strictPath = minimizeTurns({
+      path: originalPath,
+      obstacles,
+      labelBounds,
+      originalPath,
+    })
+    const boundaryPath = minimizeTurns({
+      path: originalPath,
+      obstacles,
+      labelBounds,
+      originalPath,
+      allowLabelBoundaryExtension: true,
+    })
 
-  const relaxedPath = minimizeTurns({
-    path: originalPath,
-    obstacles: [
-      ...staticObstacles,
-      ...getTraceObstacles(relaxedObstacleTraces),
-    ],
-    labelBounds,
-    originalPath: originalPath,
-  })
+    return chooseLengthPreservingBoundaryRoute({
+      strictPath,
+      boundaryPath,
+    })
+  }
+
+  const strictPath = minimizeForObstacles([
+    ...staticObstacles,
+    ...getTraceObstacles(otherTraces),
+  ])
+
+  const relaxedPath = minimizeForObstacles([
+    ...staticObstacles,
+    ...getTraceObstacles(relaxedObstacleTraces),
+  ])
 
   const sameNetTraces = otherTraces.filter(
     (trace) => trace.globalConnNetId === targetTrace.globalConnNetId,

package/lib/solvers/TraceCleanupSolver/turnMinimization.ts

@@ -20,11 +20,13 @@ export const minimizeTurns = ({
   obstacles,
   labelBounds,
   originalPath,
+  allowLabelBoundaryExtension = false,
 }: {
   path: Point[]
   obstacles: any[]
   labelBounds: any[]
   originalPath: Point[]
+  allowLabelBoundaryExtension?: boolean
 }): Point[] => {
   if (path.length <= 2) {
     return path
@@ -73,6 +75,7 @@ export const minimizeTurns = ({
           const collidesWithLabels = hasCollisionsWithLabels(
             connection,
             labelBounds,
+            allowLabelBoundaryExtension ? { originalPath } : {},
           )
 
           if (!collidesWithObstacles && !collidesWithLabels) {
@@ -136,6 +139,7 @@ export const minimizeTurns = ({
             const collidesWithLabels = hasCollisionsWithLabels(
               connectionSegments,
               labelBounds,
+              allowLabelBoundaryExtension ? { originalPath } : {},
             )
 
             if (!collidesWithObstacles && !collidesWithLabels) {
@@ -186,6 +190,7 @@ export const minimizeTurns = ({
           const collidesWithLabels = hasCollisionsWithLabels(
             [p1, p3],
             labelBounds,
+            allowLabelBoundaryExtension ? { originalPath } : {},
           )
 
           if (!collidesWithObstacles && !collidesWithLabels) {

package/package.json

@@ -5,7 +5,7 @@
     "url": "https://github.com/tscircuit/schematic-trace-solver.git"
   },
   "main": "dist/index.js",
-  "version": "0.0.182",
+  "version": "0.0.183",
   "type": "module",
   "scripts": {
     "start": "cosmos",