Untangle generated net-label connector crossings

lib/solvers/SchematicTracePipelineSolver/SchematicTracePipelineSolver.ts

@@ -93,6 +93,7 @@ export class SchematicTracePipelineSolver extends BaseSolver {
   example28Solver?: Example28Solver
   availableNetOrientationSolver?: AvailableNetOrientationSolver
   postLabelTraceOverlapShiftSolver?: TraceOverlapShiftSolver
+  postLabelTraceCleanupSolver?: TraceCleanupSolver
   railNetLabelCornerPlacementSolver?: RailNetLabelCornerPlacementSolver
   traceAnchoredNetLabelOverlapSolver?: TraceAnchoredNetLabelOverlapSolver
   preAlignmentNetLabelTraceCollisionSolver?: NetLabelTraceCollisionSolver
@@ -394,16 +395,45 @@ export class SchematicTracePipelineSolver extends BaseSolver {
         },
       ],
     ),
+    definePipelineStep(
+      "postLabelTraceCleanupSolver",
+      TraceCleanupSolver,
+      (instance) => {
+        const traces = Object.values(
+          instance.postLabelTraceOverlapShiftSolver!.correctedTraceMap,
+        )
+        const labelMergingOutput =
+          instance.traceLabelOverlapAvoidanceSolver!.labelMergingSolver!.getOutput()
+
+        return [
+          {
+            inputProblem: instance.inputProblem,
+            allTraces: traces,
+            allLabelPlacements:
+              instance.availableNetOrientationSolver!.outputNetLabelPlacements,
+            mergedLabelNetIdMap: labelMergingOutput.mergedLabelNetIdMap,
+            paddingBuffer: 0.1,
+            operations: ["untangling_traces"],
+            crossingsOnly: true,
+            eligibleTraceIds: new Set(
+              traces
+                .filter((trace) =>
+                  trace.mspPairId.startsWith("available-net-orientation-"),
+                )
+                .map((trace) => trace.mspPairId),
+            ),
+          },
+        ]
+      },
+    ),
     definePipelineStep(
       "railNetLabelCornerPlacementSolver",
       RailNetLabelCornerPlacementSolver,
       (instance) => {
         return [
           {
             inputProblem: instance.inputProblem,
-            traces: Object.values(
-              instance.postLabelTraceOverlapShiftSolver!.correctedTraceMap,
-            ),
+            traces: instance.postLabelTraceCleanupSolver!.getOutput().traces,
             netLabelPlacements:
               instance.availableNetOrientationSolver!.outputNetLabelPlacements,
           },

lib/solvers/TraceCleanupSolver/TraceCleanupSolver.ts

@@ -25,6 +25,8 @@ export interface TraceCleanupSolverInput {
   paddingBuffer: number
   operations?: readonly TraceCleanupOperation[]
   eligibleTraceIds?: ReadonlySet<string>
+  /** Stop untangling after strict crossings; skip the general L-shape pass. */
+  crossingsOnly?: boolean
 }
 
 import { UntangleTraceSubsolver } from "./sub-solver/UntangleTraceSubsolver"

lib/solvers/TraceCleanupSolver/sub-solver/UntangleTraceSubsolver.ts

@@ -55,6 +55,8 @@ export interface UntangleTraceSubsolverInput {
   mergedLabelNetIdMap: Record<string, Set<string>>
   paddingBuffer: number
   eligibleTraceIds?: ReadonlySet<string>
+  /** Stop after resolving strict crossings; skip the general L-shape pass. */
+  crossingsOnly?: boolean
 }
 
 /**
@@ -137,6 +139,10 @@ export class UntangleTraceSubsolver extends BaseSolver {
         }
         return
       }
+      if (this.input.crossingsOnly) {
+        this.solved = true
+        return
+      }
       this.processingCrossings = false
       this._initializeLShapes()
       return

tests/repros/repro-pmp11282-netlabel-connector-crosses-trace.test.ts

@@ -58,7 +58,7 @@ const inputProblem: InputProblem = {
   maxMspPairDistance: pmpInput.maxMspPairDistance,
 }
 
-test("PMP11282 V20V2 label connector crosses a different-net trace", () => {
+test("PMP11282 V20V2 label connector avoids a different-net trace", () => {
   const solver = new SchematicTracePipelineSolver(inputProblem, {
     hideRatsNet: true,
   })
@@ -80,6 +80,6 @@ test("PMP11282 V20V2 label connector crosses a different-net trace", () => {
       labelConnector.tracePath,
       crossedTrace.tracePath,
     ),
-  ).toHaveLength(1)
+  ).toHaveLength(0)
   expect(solver).toMatchSolverSnapshot(import.meta.path)
 })