@tscircuit/schematic-trace-solver 0.0.45 → 0.0.46

package/lib/solvers/TraceLabelOverlapAvoidanceSolver/sub-solvers/OverlapAvoidanceStepSolver/OverlapAvoidanceStepSolver.ts

@@ -6,14 +6,17 @@ import { visualizeInputProblem } from "lib/solvers/SchematicTracePipelineSolver/
 import type { InputProblem } from "lib/types/InputProblem"
 import { detectTraceLabelOverlap } from "../../detectTraceLabelOverlap"
 import { SingleOverlapSolver } from "../SingleOverlapSolver/SingleOverlapSolver"
+import { isPointInsideLabel } from "./isPointInsideLabel"
+import { visualizeDecomposition } from "./visualizeDecomposition"
 
 type Overlap = ReturnType<typeof detectTraceLabelOverlap>[0]
 
 // Define a type for the input of the internal overlap solver to avoid conflicts
-interface OverlapCollectionSolverInput {
+export interface OverlapCollectionSolverInput {
   inputProblem: InputProblem
   traces: SolvedTracePath[]
-  netLabelPlacements: NetLabelPlacement[]
+  initialNetLabelPlacements: NetLabelPlacement[]
+  mergedNetLabelPlacements: NetLabelPlacement[]
   mergedLabelNetIdMap: Record<string, Set<string>>
 }
 
@@ -23,7 +26,8 @@ interface OverlapCollectionSolverInput {
  */
 export class OverlapAvoidanceStepSolver extends BaseSolver {
   inputProblem: InputProblem
-  netLabelPlacements: NetLabelPlacement[]
+  initialNetLabelPlacements: NetLabelPlacement[]
+  mergedNetLabelPlacements: NetLabelPlacement[]
   mergedLabelNetIdMap: Record<string, Set<string>>
 
   allTraces: SolvedTracePath[]
@@ -36,15 +40,21 @@ export class OverlapAvoidanceStepSolver extends BaseSolver {
   private overlapQueue: Overlap[] = []
   private recentlyFailed: Set<string> = new Set()
 
+  private currentlyProcessingOverlap: Overlap | null = null
+  private decomposedChildLabels: NetLabelPlacement[] | null = null
+
   constructor(solverInput: OverlapCollectionSolverInput) {
     super()
     this.inputProblem = solverInput.inputProblem
-    this.netLabelPlacements = solverInput.netLabelPlacements
+    this.initialNetLabelPlacements = solverInput.initialNetLabelPlacements
+    this.mergedNetLabelPlacements = solverInput.mergedNetLabelPlacements
     this.mergedLabelNetIdMap = solverInput.mergedLabelNetIdMap
     this.allTraces = [...solverInput.traces]
   }
 
   override _step() {
+    this.currentlyProcessingOverlap = null
+    this.decomposedChildLabels = null
     if (this.activeSubSolver) {
       this.activeSubSolver.step()
 
@@ -65,19 +75,14 @@ export class OverlapAvoidanceStepSolver extends BaseSolver {
         const overlapId = `${this.activeSubSolver.initialTrace.mspPairId}-${this.activeSubSolver.label.globalConnNetId}`
         this.recentlyFailed.add(overlapId)
         this.activeSubSolver = null
+      } else {
       }
       return
     }
 
-    const overlaps = detectTraceLabelOverlap(
-      this.allTraces,
-      this.netLabelPlacements,
-    ).filter((o) => {
-      const originalNetIds = this.mergedLabelNetIdMap[o.label.globalConnNetId]
-      if (originalNetIds) {
-        return !originalNetIds.has(o.trace.globalConnNetId)
-      }
-      return o.trace.globalConnNetId !== o.label.globalConnNetId
+    const overlaps = detectTraceLabelOverlap({
+      traces: this.allTraces,
+      netLabels: this.mergedNetLabelPlacements,
     })
 
     if (overlaps.length === 0) {
@@ -85,6 +90,7 @@ export class OverlapAvoidanceStepSolver extends BaseSolver {
       return
     }
 
+    // Filter out overlaps that have recently failed to avoid infinite loops
     const nonFailedOverlaps = overlaps.filter((o) => {
       const overlapId = `${o.trace.mspPairId}-${o.label.globalConnNetId}`
       return !this.recentlyFailed.has(overlapId)
@@ -98,24 +104,104 @@ export class OverlapAvoidanceStepSolver extends BaseSolver {
     this.overlapQueue = nonFailedOverlaps
 
     const nextOverlap = this.overlapQueue.shift()
+    this.currentlyProcessingOverlap = nextOverlap ?? null
 
     if (nextOverlap) {
       const traceToFix = this.allTraces.find(
         (t) => t.mspPairId === nextOverlap.trace.mspPairId,
-      )
-      if (traceToFix) {
-        const labelId = nextOverlap.label.globalConnNetId
-        const detourCount = this.detourCountByLabel[labelId] || 0
-        this.detourCountByLabel[labelId] = detourCount + 1
-
-        this.activeSubSolver = new SingleOverlapSolver({
-          trace: traceToFix,
-          label: nextOverlap.label,
-          problem: this.inputProblem,
-          paddingBuffer: this.PADDING_BUFFER,
-          detourCount,
-        })
+      )!
+      const labelToAvoid = nextOverlap.label
+      const traceStartPoint = traceToFix.tracePath[0]
+
+      const originalNetIds =
+        this.mergedLabelNetIdMap[labelToAvoid.globalConnNetId]
+      const isSelfOverlap = originalNetIds?.has(traceToFix.globalConnNetId)
+
+      if (isSelfOverlap) {
+        const childLabels = this.initialNetLabelPlacements.filter((l) =>
+          originalNetIds.has(l.globalConnNetId),
+        )
+        this.decomposedChildLabels = childLabels
+        let actualOverlapLabel: NetLabelPlacement | null = null
+
+        for (const childLabel of childLabels) {
+          const overlapsWithChild = detectTraceLabelOverlap({
+            traces: [traceToFix],
+            netLabels: [childLabel],
+          })
+          if (overlapsWithChild.length > 0) {
+            actualOverlapLabel = childLabel
+            break
+          }
+        }
+
+        if (actualOverlapLabel) {
+          const labelId = actualOverlapLabel.globalConnNetId
+          const detourCount = this.detourCountByLabel[labelId] || 0
+          this.detourCountByLabel[labelId] = detourCount + 1
+          this.activeSubSolver = new SingleOverlapSolver({
+            trace: traceToFix,
+            label: actualOverlapLabel,
+            problem: this.inputProblem,
+            paddingBuffer: this.PADDING_BUFFER,
+            detourCount,
+          })
+        } else {
+          const overlapId = `${traceToFix.mspPairId}-${labelToAvoid.globalConnNetId}`
+          this.recentlyFailed.add(overlapId)
+        }
+        return
+      }
+
+      if (
+        originalNetIds &&
+        isPointInsideLabel({ point: traceStartPoint, label: labelToAvoid })
+      ) {
+        const childLabels = this.initialNetLabelPlacements.filter((l) =>
+          originalNetIds.has(l.globalConnNetId),
+        )
+        this.decomposedChildLabels = childLabels
+        let actualOverlapLabel: NetLabelPlacement | null = null
+
+        for (const childLabel of childLabels) {
+          const overlapsWithChild = detectTraceLabelOverlap({
+            traces: [traceToFix],
+            netLabels: [childLabel],
+          })
+          if (overlapsWithChild.length > 0) {
+            actualOverlapLabel = childLabel
+            break
+          }
+        }
+
+        if (actualOverlapLabel) {
+          const labelId = actualOverlapLabel.globalConnNetId
+          const detourCount = this.detourCountByLabel[labelId] || 0
+          this.detourCountByLabel[labelId] = detourCount + 1
+          this.activeSubSolver = new SingleOverlapSolver({
+            trace: traceToFix,
+            label: actualOverlapLabel,
+            problem: this.inputProblem,
+            paddingBuffer: this.PADDING_BUFFER,
+            detourCount,
+          })
+        } else {
+          const overlapId = `${traceToFix.mspPairId}-${labelToAvoid.globalConnNetId}`
+          this.recentlyFailed.add(overlapId)
+        }
+        return
       }
+
+      const labelId = labelToAvoid.globalConnNetId
+      const detourCount = this.detourCountByLabel[labelId] || 0
+      this.detourCountByLabel[labelId] = detourCount + 1
+      this.activeSubSolver = new SingleOverlapSolver({
+        trace: traceToFix,
+        label: labelToAvoid,
+        problem: this.inputProblem,
+        paddingBuffer: this.PADDING_BUFFER,
+        detourCount,
+      })
     }
   }
 
@@ -130,7 +216,7 @@ export class OverlapAvoidanceStepSolver extends BaseSolver {
     if (this.activeSubSolver) {
       return this.activeSubSolver.visualize()
     }
-    // When idle, show all the traces
+
     const graphics = visualizeInputProblem(this.inputProblem)
     if (!graphics.lines) graphics.lines = []
     for (const trace of this.allTraces) {
@@ -139,6 +225,43 @@ export class OverlapAvoidanceStepSolver extends BaseSolver {
         strokeColor: "purple",
       })
     }
+
+    if (this.currentlyProcessingOverlap) {
+      const { trace, label } = this.currentlyProcessingOverlap
+
+      // Highlight the colliding trace
+      graphics.lines!.push({
+        points: trace.tracePath,
+        strokeColor: "red",
+      })
+
+      if (this.decomposedChildLabels) {
+        visualizeDecomposition({
+          decomposedChildLabels: this.decomposedChildLabels,
+          collidingTrace: trace,
+          mergedLabel: label,
+          graphics,
+        })
+      } else {
+        // Standard case: highlight the entire label
+        if (!graphics.rects) graphics.rects = []
+        graphics.rects.push({
+          center: label.center,
+          width: label.width,
+          height: label.height,
+          fill: "yellow",
+        })
+        if (!graphics.texts) graphics.texts = []
+        graphics.texts.push({
+          x: label.center.x,
+          y: label.center.y + label.height / 2 + 0.5,
+          text: `COLLISION: Trace ${trace.mspPairId} vs Label ${label.globalConnNetId}`,
+          fontSize: 0.3,
+          color: "red",
+        })
+      }
+    }
+
     return graphics
   }
 }

package/lib/solvers/TraceLabelOverlapAvoidanceSolver/sub-solvers/OverlapAvoidanceStepSolver/isPointInsideLabel.ts

@@ -0,0 +1,23 @@
+import type { Point } from "graphics-debug"
+import type { NetLabelPlacement } from "lib/solvers/NetLabelPlacementSolver/NetLabelPlacementSolver"
+import { getRectBounds } from "lib/solvers/NetLabelPlacementSolver/SingleNetLabelPlacementSolver/geometry"
+
+/**
+ * Checks if a point is inside the bounding box of a net label.
+ */
+export const isPointInsideLabel = ({
+  point,
+  label,
+}: {
+  point: Point
+  label: NetLabelPlacement
+}): boolean => {
+  const bounds = getRectBounds(label.center, label.width, label.height)
+
+  return (
+    point.x >= bounds.minX &&
+    point.x <= bounds.maxX &&
+    point.y >= bounds.minY &&
+    point.y <= bounds.maxY
+  )
+}

package/lib/solvers/TraceLabelOverlapAvoidanceSolver/sub-solvers/OverlapAvoidanceStepSolver/visualizeDecomposition.ts

@@ -0,0 +1,54 @@
+import type { GraphicsObject } from "graphics-debug"
+import type { NetLabelPlacement } from "lib/solvers/NetLabelPlacementSolver/NetLabelPlacementSolver"
+import type { SolvedTracePath } from "lib/solvers/SchematicTraceLinesSolver/SchematicTraceLinesSolver"
+
+interface VisualizeDecompositionParams {
+  decomposedChildLabels: NetLabelPlacement[]
+  collidingTrace: SolvedTracePath
+  mergedLabel: NetLabelPlacement
+  graphics: GraphicsObject
+}
+
+/**
+ * Visualizes the decomposition of a merged label during overlap avoidance.
+ * It draws individual child labels with distinct colors based on their relation
+ * to the colliding trace and adds a textual report to the graphics.
+ *
+ * @param {VisualizeDecompositionParams} params - The parameters for visualization.
+ * @param {NetLabelPlacement[]} params.decomposedChildLabels - The individual labels that make up the merged group.
+ * @param {SolvedTracePath} params.collidingTrace - The trace that is currently colliding with the merged label.
+ * @param {NetLabelPlacement} params.mergedLabel - The original merged label that is being decomposed.
+ * @param {GraphicsObject} params.graphics - The graphics object to which the visualization elements will be added.
+ * @returns {GraphicsObject} The modified graphics object with decomposition visualization elements.
+ */
+export const visualizeDecomposition = (
+  params: VisualizeDecompositionParams,
+): GraphicsObject => {
+  const { decomposedChildLabels, collidingTrace, mergedLabel, graphics } =
+    params
+
+  if (!graphics.rects) graphics.rects = []
+  if (!graphics.texts) graphics.texts = []
+
+  for (const childLabel of decomposedChildLabels) {
+    const isOwnLabel =
+      childLabel.globalConnNetId === collidingTrace.globalConnNetId
+
+    graphics.rects.push({
+      center: childLabel.center,
+      width: childLabel.width,
+      height: childLabel.height,
+      fill: isOwnLabel ? "green" : "red", // Green for own label, red for others
+    })
+  }
+
+  graphics.texts.push({
+    x: mergedLabel.center.x,
+    y: mergedLabel.center.y + mergedLabel.height / 2 + 0.5,
+    text: `DECOMPOSITION: Trace ${collidingTrace.mspPairId} vs Merged Label ${mergedLabel.globalConnNetId}`,
+    fontSize: 0.3,
+    color: "blue",
+  })
+
+  return graphics
+}

package/package.json

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

package/tests/solvers/TraceLabelOverlapAvoidanceSolver/__snapshots__/TraceLabelOverlapAvoidanceSolver.snap.svg

@@ -160,28 +160,28 @@ x-" data-x="-0.42" data-y="-0.1" cx="279.0224461302513" cy="382.68590086027035"
     <rect data-type="rect" data-label="schematic_component_6" data-x="0" data-y="0" x="277.802876074604" y="349.51359534666426" width="43.416693981043295" height="56.58805058203393" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.020499027410714285" />
   </g>
   <g>
-    <rect data-type="rect" data-label="connectivity_net0" data-x="-4.78" data-y="2.7600000000000002" x="55.35329792453959" y="238.288806271632" width="21.95226100165104" height="9.75656044517828" fill="hsl(40, 100%, 50%, 0.3)" stroke="hsl(40, 100%, 50%, 1)" stroke-width="0.020499027410714285" />
+    <rect data-type="rect" data-label="connectivity_net2" data-x="6" data-y="0.776" x="587.3297561978845" y="328.976035609564" width="9.756560445178138" height="21.952261001651095" fill="hsl(40, 100%, 50%, 0.3)" stroke="hsl(40, 100%, 50%, 1)" stroke-width="0.020499027410714285" />
   </g>
   <g>
-    <rect data-type="rect" data-label="connectivity_net3" data-x="3" data-y="-0.93" x="440.9813495202105" y="415.85820637387644" width="9.756560445178309" height="14.634840667767435" fill="hsl(40, 100%, 50%, 0.3)" stroke="hsl(40, 100%, 50%, 1)" stroke-width="0.020499027410714285" />
+    <rect data-type="rect" data-label="connectivity_net2" data-x="3.7199999999999998" data-y="3.225" x="476.10496712285226" y="209.50695295835615" width="9.756560445178252" height="21.952261001651095" fill="hsl(40, 100%, 50%, 0.3)" stroke="hsl(40, 100%, 50%, 1)" stroke-width="0.020499027410714285" />
   </g>
   <g>
-    <rect data-type="rect" data-label="connectivity_net3" data-x="6" data-y="-0.7010000000000001" x="587.3297561978845" y="404.68694466414735" width="9.756560445178138" height="14.634840667767378" fill="hsl(40, 100%, 50%, 0.3)" stroke="hsl(40, 100%, 50%, 1)" stroke-width="0.020499027410714285" />
+    <rect data-type="rect" data-label="connectivity_net1" data-x="0.3" data-y="0.8059999999999999" x="309.2677835103039" y="327.51255154278726" width="9.756560445178309" height="21.952261001651095" fill="hsl(40, 100%, 50%, 0.3)" stroke="hsl(40, 100%, 50%, 1)" stroke-width="0.020499027410714285" />
   </g>
   <g>
-    <rect data-type="rect" data-label="connectivity_net3" data-x="-4.995" data-y="-0.7958008" x="50.96284572420936" y="409.31159334140364" width="9.756560445178224" height="14.634840667767378" fill="hsl(40, 100%, 50%, 0.3)" stroke="hsl(40, 100%, 50%, 1)" stroke-width="0.020499027410714285" />
+    <rect data-type="rect" data-label="connectivity_net1" data-x="0.78" data-y="3.1950000000000003" x="332.68352857873174" y="210.97043702513287" width="9.756560445178252" height="21.952261001651124" fill="hsl(40, 100%, 50%, 0.3)" stroke="hsl(40, 100%, 50%, 1)" stroke-width="0.020499027410714285" />
   </g>
   <g>
-    <rect data-type="rect" data-label="connectivity_net1" data-x="0.78" data-y="3.1950000000000003" x="332.68352857873174" y="210.97043702513287" width="9.756560445178252" height="21.952261001651124" fill="hsl(40, 100%, 50%, 0.3)" stroke="hsl(40, 100%, 50%, 1)" stroke-width="0.020499027410714285" />
+    <rect data-type="rect" data-label="connectivity_net3" data-x="6" data-y="-0.7010000000000001" x="587.3297561978845" y="404.68694466414735" width="9.756560445178138" height="14.634840667767378" fill="hsl(40, 100%, 50%, 0.3)" stroke="hsl(40, 100%, 50%, 1)" stroke-width="0.020499027410714285" />
   </g>
   <g>
-    <rect data-type="rect" data-label="merged-group-M1-y+" data-x="-0.39186722499999993" data-y="0.4655" x="241.7653395028014" y="327.51255154278726" width="77.25900445268081" height="55.17334931748309" fill="hsl(296, 100%, 50%, 0.3)" stroke="hsl(296, 100%, 50%, 1)" stroke-width="0.020499027410714285" />
+    <rect data-type="rect" data-label="connectivity_net3" data-x="3" data-y="-0.93" x="440.9813495202105" y="415.85820637387644" width="9.756560445178309" height="14.634840667767435" fill="hsl(40, 100%, 50%, 0.3)" stroke="hsl(40, 100%, 50%, 1)" stroke-width="0.020499027410714285" />
   </g>
   <g>
-    <rect data-type="rect" data-label="connectivity_net2" data-x="3.7199999999999998" data-y="3.225" x="476.10496712285226" y="209.50695295835615" width="9.756560445178252" height="21.952261001651095" fill="hsl(40, 100%, 50%, 0.3)" stroke="hsl(40, 100%, 50%, 1)" stroke-width="0.020499027410714285" />
+    <rect data-type="rect" data-label="connectivity_net0" data-x="-4.78" data-y="2.7600000000000002" x="55.35329792453959" y="238.288806271632" width="21.95226100165104" height="9.75656044517828" fill="hsl(40, 100%, 50%, 0.3)" stroke="hsl(40, 100%, 50%, 1)" stroke-width="0.020499027410714285" />
   </g>
   <g>
-    <rect data-type="rect" data-label="connectivity_net2" data-x="6" data-y="0.776" x="587.3297561978845" y="328.976035609564" width="9.756560445178138" height="21.952261001651095" fill="hsl(40, 100%, 50%, 0.3)" stroke="hsl(40, 100%, 50%, 1)" stroke-width="0.020499027410714285" />
+    <rect data-type="rect" data-label="connectivity_net4" data-x="-1.08373445" data-y="0.12500000000000014" x="241.7653395028014" y="360.73363985861926" width="9.75656044517828" height="21.952261001651095" fill="hsl(40, 100%, 50%, 0.3)" stroke="hsl(40, 100%, 50%, 1)" stroke-width="0.020499027410714285" />
   </g>
   <g id="crosshair" style="display: none">
     <line id="crosshair-h" y1="0" y2="640" stroke="#666" stroke-width="0.5" />