@tscircuit/schematic-trace-solver 0.0.61 → 0.0.62

package/dist/index.d.ts

@@ -647,10 +647,10 @@ type CandidateLabel = {
     width: number;
     height: number;
 };
-type CandidateStatus$1 = "valid" | "chip-collision" | "trace-collision" | "netlabel-collision";
+type CandidateStatus$2 = "valid" | "chip-collision" | "trace-collision" | "netlabel-collision";
 type CandidatePhase = "rotate" | "shift" | "lateral-shift";
 type EvaluatedCandidate = CandidateLabel & {
-    status: CandidateStatus$1;
+    status: CandidateStatus$2;
     selected: boolean;
     phase: CandidatePhase;
     distance?: number;
@@ -782,7 +782,7 @@ type LabelOverlap = {
     firstLabelIndex: number;
     secondLabelIndex: number;
 };
-type CandidateStatus = "valid" | "chip-collision" | "trace-collision" | "netlabel-collision";
+type CandidateStatus$1 = "valid" | "chip-collision" | "trace-collision" | "netlabel-collision";
 type LabelCandidate = {
     anchorPoint: Point;
     center: Point;
@@ -792,7 +792,7 @@ type LabelCandidate = {
     traceId: string;
     pathDistance: number;
     distanceFromOriginal: number;
-    status: CandidateStatus;
+    status: CandidateStatus$1;
     selected: boolean;
 };
 
@@ -860,6 +860,65 @@ declare class NetLabelTraceCollisionSolver extends BaseSolver {
     visualize(): GraphicsObject;
 }
 
+type CandidateStatus = "ok" | "chip-collision" | "trace-collision" | "label-collision";
+type Candidate = {
+    orientation: FacingDirection;
+    anchor: {
+        x: number;
+        y: number;
+    };
+    center: {
+        x: number;
+        y: number;
+    };
+    width: number;
+    height: number;
+    bounds: {
+        minX: number;
+        minY: number;
+        maxX: number;
+        maxY: number;
+    };
+    hostPairId?: MspConnectionPairId;
+    hostSegIndex?: number;
+    status: CandidateStatus | null;
+};
+interface NetLabelNetLabelCollisionSolverParams {
+    inputProblem: InputProblem;
+    traces: SolvedTracePath[];
+    netLabelPlacements: NetLabelPlacement[];
+}
+declare class NetLabelNetLabelCollisionSolver extends BaseSolver {
+    inputProblem: InputProblem;
+    traces: SolvedTracePath[];
+    netLabelPlacements: NetLabelPlacement[];
+    outputNetLabelPlacements: NetLabelPlacement[];
+    currentCollision: [NetLabelPlacement, NetLabelPlacement] | null;
+    currentLabelToMove: NetLabelPlacement | null;
+    candidateResults: Candidate[];
+    private chipIndex;
+    private traceMap;
+    private skippedCollisionKeys;
+    private labelsToTry;
+    private candidateQueue;
+    private candidateIndex;
+    constructor(params: NetLabelNetLabelCollisionSolverParams);
+    getConstructorParams(): ConstructorParameters<typeof NetLabelNetLabelCollisionSolver>[0];
+    getOutput(): {
+        netLabelPlacements: NetLabelPlacement[];
+    };
+    private labelBounds;
+    private collisionKey;
+    private findNextCollidingPair;
+    private netLabelWidthOf;
+    private buildCandidatesForLabel;
+    private checkCandidate;
+    private beginSearchForLabel;
+    private clearActiveSearch;
+    _step(): void;
+    visualize(): GraphicsObject;
+}
+
 /**
  * Pipeline solver that runs a series of solvers to find the best schematic layout.
  * Coordinates the entire layout process from chip partitioning through final packing.
@@ -890,12 +949,13 @@ declare class SchematicTracePipelineSolver extends BaseSolver {
     vccNetLabelCornerPlacementSolver?: VccNetLabelCornerPlacementSolver;
     traceAnchoredNetLabelOverlapSolver?: TraceAnchoredNetLabelOverlapSolver;
     netLabelTraceCollisionSolver?: NetLabelTraceCollisionSolver;
+    netLabelNetLabelCollisionSolver?: NetLabelNetLabelCollisionSolver;
     startTimeOfPhase: Record<string, number>;
     endTimeOfPhase: Record<string, number>;
     timeSpentOnPhase: Record<string, number>;
     firstIterationOfPhase: Record<string, number>;
     inputProblem: InputProblem;
-    pipelineDef: (PipelineStep<typeof MspConnectionPairSolver> | PipelineStep<typeof SchematicTraceLinesSolver> | PipelineStep<typeof LongDistancePairSolver> | PipelineStep<typeof TraceOverlapShiftSolver> | PipelineStep<typeof NetLabelPlacementSolver> | PipelineStep<typeof TraceLabelOverlapAvoidanceSolver> | PipelineStep<typeof TraceCleanupSolver> | PipelineStep<typeof Example28Solver> | PipelineStep<typeof AvailableNetOrientationSolver> | PipelineStep<typeof VccNetLabelCornerPlacementSolver> | PipelineStep<typeof TraceAnchoredNetLabelOverlapSolver> | PipelineStep<typeof NetLabelTraceCollisionSolver>)[];
+    pipelineDef: (PipelineStep<typeof MspConnectionPairSolver> | PipelineStep<typeof SchematicTraceLinesSolver> | PipelineStep<typeof LongDistancePairSolver> | PipelineStep<typeof TraceOverlapShiftSolver> | PipelineStep<typeof NetLabelPlacementSolver> | PipelineStep<typeof TraceLabelOverlapAvoidanceSolver> | PipelineStep<typeof TraceCleanupSolver> | PipelineStep<typeof Example28Solver> | PipelineStep<typeof AvailableNetOrientationSolver> | PipelineStep<typeof VccNetLabelCornerPlacementSolver> | PipelineStep<typeof TraceAnchoredNetLabelOverlapSolver> | PipelineStep<typeof NetLabelTraceCollisionSolver> | PipelineStep<typeof NetLabelNetLabelCollisionSolver>)[];
     constructor(inputProblem: InputProblem);
     getConstructorParams(): ConstructorParameters<typeof SchematicTracePipelineSolver>[0];
     currentPipelineStepIndex: number;

package/dist/index.js

@@ -7605,6 +7605,338 @@ globalConnNetId: ${label.globalConnNetId}`
   }
 };
 
+// lib/solvers/NetLabelNetLabelCollisionSolver/NetLabelNetLabelCollisionSolver.ts
+var ANCHOR_TRACE_CLEARANCE = 1e-4;
+var SEGMENT_PARALLEL_EPS = 1e-6;
+var CANDIDATE_STEP2 = 0.1;
+var OUTWARD_DIR = {
+  "x+": { x: 1, y: 0 },
+  "x-": { x: -1, y: 0 },
+  "y+": { x: 0, y: 1 },
+  "y-": { x: 0, y: -1 }
+};
+var CANDIDATE_STATUS_COLOR = {
+  ok: "green",
+  "label-collision": "orange",
+  "trace-collision": "darkorange",
+  "chip-collision": "red"
+};
+var CANDIDATE_STATUS_FILL = {
+  ok: "rgba(0, 200, 0, 0.25)",
+  "label-collision": "rgba(255, 160, 0, 0.2)",
+  "trace-collision": "rgba(200, 80, 0, 0.2)",
+  "chip-collision": "rgba(220, 0, 0, 0.15)"
+};
+function boundsOverlap(a, b) {
+  return a.minX < b.maxX - 1e-9 && a.maxX > b.minX + 1e-9 && a.minY < b.maxY - 1e-9 && a.maxY > b.minY + 1e-9;
+}
+function sampleAnchorsAlongSegment(a, b) {
+  const dx = b.x - a.x;
+  const dy = b.y - a.y;
+  const len = Math.sqrt(dx * dx + dy * dy);
+  const steps = Math.max(1, Math.round(len / CANDIDATE_STEP2));
+  const anchors = [];
+  for (let k = 0; k <= steps; k++) {
+    const t = k / steps;
+    anchors.push({ x: a.x + t * dx, y: a.y + t * dy });
+  }
+  return anchors;
+}
+var NetLabelNetLabelCollisionSolver = class extends BaseSolver {
+  inputProblem;
+  traces;
+  netLabelPlacements;
+  outputNetLabelPlacements;
+  currentCollision = null;
+  currentLabelToMove = null;
+  candidateResults = [];
+  chipIndex;
+  traceMap;
+  skippedCollisionKeys = /* @__PURE__ */ new Set();
+  labelsToTry = [];
+  candidateQueue = [];
+  candidateIndex = 0;
+  constructor(params) {
+    super();
+    this.inputProblem = params.inputProblem;
+    this.traces = params.traces;
+    this.netLabelPlacements = params.netLabelPlacements;
+    this.outputNetLabelPlacements = [...params.netLabelPlacements];
+    this.chipIndex = params.inputProblem._chipObstacleSpatialIndex ?? new ChipObstacleSpatialIndex(params.inputProblem.chips);
+    this.traceMap = Object.fromEntries(
+      params.traces.map((t) => [t.mspPairId, t])
+    );
+  }
+  getConstructorParams() {
+    return {
+      inputProblem: this.inputProblem,
+      traces: this.traces,
+      netLabelPlacements: this.netLabelPlacements
+    };
+  }
+  getOutput() {
+    return { netLabelPlacements: this.outputNetLabelPlacements };
+  }
+  labelBounds(label) {
+    return getRectBounds(label.center, label.width, label.height);
+  }
+  collisionKey(a, b) {
+    return [a.globalConnNetId, b.globalConnNetId].sort().join("::");
+  }
+  findNextCollidingPair() {
+    const labels = this.outputNetLabelPlacements;
+    for (let i = 0; i < labels.length; i++) {
+      for (let j = i + 1; j < labels.length; j++) {
+        const a = labels[i];
+        const b = labels[j];
+        if (a.globalConnNetId === b.globalConnNetId) continue;
+        if (this.skippedCollisionKeys.has(this.collisionKey(a, b))) continue;
+        if (boundsOverlap(this.labelBounds(a), this.labelBounds(b)))
+          return [a, b];
+      }
+    }
+    return null;
+  }
+  netLabelWidthOf(label) {
+    if (label.orientation === "x+" || label.orientation === "x-")
+      return label.width;
+    return label.height;
+  }
+  buildCandidatesForLabel(label) {
+    const netLabelWidth = this.netLabelWidthOf(label);
+    const candidates = [];
+    const buildCandidate = (orientation, anchor, hostPairId, hostSegIndex) => {
+      const { width, height } = getDimsForOrientation({
+        orientation,
+        netLabelWidth
+      });
+      const baseCenter = getCenterFromAnchor(anchor, orientation, width, height);
+      const outwardDir = OUTWARD_DIR[orientation];
+      const center = {
+        x: baseCenter.x + outwardDir.x * ANCHOR_TRACE_CLEARANCE,
+        y: baseCenter.y + outwardDir.y * ANCHOR_TRACE_CLEARANCE
+      };
+      return {
+        orientation,
+        anchor,
+        center,
+        width,
+        height,
+        bounds: getRectBounds(center, width, height),
+        hostPairId,
+        hostSegIndex,
+        status: null
+      };
+    };
+    const isPortOnly = label.mspConnectionPairIds.length === 0;
+    if (isPortOnly) {
+      const allOrientations = ["x+", "x-", "y+", "y-"];
+      const orderedOrientations = [
+        label.orientation,
+        ...allOrientations.filter((o) => o !== label.orientation)
+      ];
+      for (const orientation of orderedOrientations) {
+        candidates.push(buildCandidate(orientation, label.anchorPoint));
+      }
+    } else {
+      for (const mspPairId of label.mspConnectionPairIds) {
+        const trace = this.traceMap[mspPairId];
+        if (!trace) continue;
+        const pts = trace.tracePath;
+        for (let si = 0; si < pts.length - 1; si++) {
+          const segStart = pts[si];
+          const segEnd = pts[si + 1];
+          const isHorizontal3 = Math.abs(segStart.y - segEnd.y) < SEGMENT_PARALLEL_EPS;
+          const isVertical4 = Math.abs(segStart.x - segEnd.x) < SEGMENT_PARALLEL_EPS;
+          if (!isHorizontal3 && !isVertical4) continue;
+          let perpendicularOrientations;
+          if (isHorizontal3) {
+            perpendicularOrientations = ["y+", "y-"];
+          } else {
+            perpendicularOrientations = ["x+", "x-"];
+          }
+          for (const anchor of sampleAnchorsAlongSegment(segStart, segEnd)) {
+            for (const orientation of perpendicularOrientations) {
+              candidates.push(
+                buildCandidate(
+                  orientation,
+                  anchor,
+                  mspPairId,
+                  si
+                )
+              );
+            }
+          }
+        }
+      }
+    }
+    return candidates;
+  }
+  checkCandidate(candidate, movingLabelNetId, obstacleLabels) {
+    const { bounds, hostPairId, hostSegIndex } = candidate;
+    if (this.chipIndex.getChipsInBounds(bounds).length > 0)
+      return "chip-collision";
+    if (rectIntersectsAnyTrace(bounds, this.traceMap, hostPairId, hostSegIndex).hasIntersection) {
+      return "trace-collision";
+    }
+    for (const obstacle of obstacleLabels) {
+      if (obstacle.globalConnNetId === movingLabelNetId) continue;
+      if (boundsOverlap(bounds, this.labelBounds(obstacle)))
+        return "label-collision";
+    }
+    return "ok";
+  }
+  beginSearchForLabel(label) {
+    this.currentLabelToMove = label;
+    this.candidateQueue = this.buildCandidatesForLabel(label);
+    this.candidateIndex = 0;
+    this.candidateResults = [];
+  }
+  clearActiveSearch() {
+    this.currentCollision = null;
+    this.currentLabelToMove = null;
+    this.labelsToTry = [];
+    this.candidateQueue = [];
+    this.candidateIndex = 0;
+    this.candidateResults = [];
+  }
+  _step() {
+    if (!this.currentCollision) {
+      const pair = this.findNextCollidingPair();
+      if (!pair) {
+        this.solved = true;
+        return;
+      }
+      this.currentCollision = pair;
+      this.labelsToTry = [pair[1], pair[0]];
+      this.beginSearchForLabel(this.labelsToTry.shift());
+      return;
+    }
+    if (this.candidateIndex >= this.candidateQueue.length) {
+      if (this.labelsToTry.length > 0) {
+        this.beginSearchForLabel(this.labelsToTry.shift());
+      } else {
+        this.skippedCollisionKeys.add(
+          this.collisionKey(this.currentCollision[0], this.currentCollision[1])
+        );
+        this.clearActiveSearch();
+      }
+      return;
+    }
+    const candidate = this.candidateQueue[this.candidateIndex++];
+    const [labelA, labelB] = this.currentCollision;
+    let fixedLabel;
+    if (this.currentLabelToMove === labelB) {
+      fixedLabel = labelA;
+    } else {
+      fixedLabel = labelB;
+    }
+    const obstacleLabels = [
+      ...this.outputNetLabelPlacements.filter(
+        (l) => l !== labelA && l !== labelB
+      ),
+      fixedLabel
+    ];
+    const status = this.checkCandidate(
+      candidate,
+      this.currentLabelToMove.globalConnNetId,
+      obstacleLabels
+    );
+    candidate.status = status;
+    this.candidateResults.push({ ...candidate });
+    if (status === "ok") {
+      const idx = this.outputNetLabelPlacements.indexOf(
+        this.currentLabelToMove
+      );
+      if (idx !== -1) {
+        this.outputNetLabelPlacements[idx] = {
+          ...this.currentLabelToMove,
+          orientation: candidate.orientation,
+          anchorPoint: candidate.anchor,
+          width: candidate.width,
+          height: candidate.height,
+          center: candidate.center
+        };
+      }
+      this.clearActiveSearch();
+    }
+  }
+  visualize() {
+    const graphics = visualizeInputProblem(this.inputProblem);
+    if (!graphics.lines) graphics.lines = [];
+    if (!graphics.rects) graphics.rects = [];
+    if (!graphics.points) graphics.points = [];
+    for (const trace of this.traces) {
+      graphics.lines.push({
+        points: trace.tracePath,
+        strokeColor: "purple"
+      });
+    }
+    for (const label of this.outputNetLabelPlacements) {
+      const isInActiveCollision = this.currentCollision != null && (label === this.currentCollision[0] || label === this.currentCollision[1]);
+      let labelFill;
+      let labelStroke;
+      let labelText;
+      let pointColor;
+      if (isInActiveCollision) {
+        labelFill = "rgba(255, 0, 0, 0.2)";
+        labelStroke = "red";
+        labelText = `netId: ${label.netId}
+globalConnNetId: ${label.globalConnNetId}
+\u26A0 COLLIDING`;
+        pointColor = "red";
+      } else {
+        labelFill = getColorFromString(label.globalConnNetId, 0.35);
+        labelStroke = getColorFromString(label.globalConnNetId, 0.9);
+        labelText = `netId: ${label.netId}
+globalConnNetId: ${label.globalConnNetId}`;
+        pointColor = getColorFromString(label.globalConnNetId, 0.9);
+      }
+      graphics.rects.push({
+        center: label.center,
+        width: label.width,
+        height: label.height,
+        fill: labelFill,
+        strokeColor: labelStroke,
+        label: labelText
+      });
+      graphics.points.push({
+        x: label.anchorPoint.x,
+        y: label.anchorPoint.y,
+        color: pointColor,
+        label: `anchorPoint
+orientation: ${label.orientation}`
+      });
+    }
+    const movingNetId = this.currentLabelToMove ? this.currentLabelToMove.netId : "?";
+    for (const c of this.candidateResults) {
+      const statusColor = CANDIDATE_STATUS_COLOR[c.status];
+      const statusFill = CANDIDATE_STATUS_FILL[c.status];
+      let strokeDash;
+      if (c.status !== "ok") strokeDash = "4 2";
+      graphics.rects.push({
+        center: c.center,
+        width: c.width,
+        height: c.height,
+        fill: statusFill,
+        strokeColor: statusColor,
+        strokeDash,
+        label: `candidate: ${c.status}
+orientation: ${c.orientation}
+moving: ${movingNetId}`
+      });
+      graphics.points.push({
+        x: c.anchor.x,
+        y: c.anchor.y,
+        color: statusColor,
+        label: `candidate anchor
+${c.status}`
+      });
+    }
+    return graphics;
+  }
+};
+
 // lib/solvers/SchematicTracePipelineSolver/SchematicTracePipelineSolver.ts
 function definePipelineStep(solverName, solverClass, getConstructorParams, opts = {}) {
   return {
@@ -7630,6 +7962,7 @@ var SchematicTracePipelineSolver = class extends BaseSolver {
   vccNetLabelCornerPlacementSolver;
   traceAnchoredNetLabelOverlapSolver;
   netLabelTraceCollisionSolver;
+  netLabelNetLabelCollisionSolver;
   startTimeOfPhase;
   endTimeOfPhase;
   timeSpentOnPhase;
@@ -7821,6 +8154,17 @@ var SchematicTracePipelineSolver = class extends BaseSolver {
           netLabelPlacements: instance.traceAnchoredNetLabelOverlapSolver.outputNetLabelPlacements
         }
       ]
+    ),
+    definePipelineStep(
+      "netLabelNetLabelCollisionSolver",
+      NetLabelNetLabelCollisionSolver,
+      (instance) => [
+        {
+          inputProblem: instance.inputProblem,
+          traces: instance.netLabelTraceCollisionSolver.getOutput().traces,
+          netLabelPlacements: instance.netLabelTraceCollisionSolver.getOutput().netLabelPlacements
+        }
+      ]
     )
   ];
   constructor(inputProblem) {