@tscircuit/schematic-trace-solver 0.0.140 → 0.0.141

package/dist/index.d.ts

@@ -279,6 +279,7 @@ declare class TraceOverlapIssueSolver extends BaseSolver {
 }
 
 type ConnNetId = string;
+type TraceState = Record<MspConnectionPairId, SolvedTracePath>;
 /**
  * This solver finds traces that overlap or meet collinearly and aren't
  * connected via the globalConnMap, then shifts them apart in the direction
@@ -308,6 +309,7 @@ declare class TraceOverlapShiftSolver extends BaseSolver {
      */
     traceNetIslands: Record<ConnNetId, Array<SolvedTracePath>>;
     correctedTraceMap: Record<MspConnectionPairId, SolvedTracePath>;
+    recentTraceStates: TraceState[];
     cleanupPhase: "diagonals" | "done" | null;
     constructor(params: {
         inputProblem: InputProblem;
@@ -324,6 +326,8 @@ declare class TraceOverlapShiftSolver extends BaseSolver {
     private findNextDiagonalSegment;
     private findAndFixNextDiagonalSegment;
     _step(): void;
+    private rememberTraceState;
+    private returnsToPreviousTraceState;
     visualize(): graphics_debug.GraphicsObject;
 }
 

package/dist/index.js

@@ -2102,6 +2102,7 @@ var TraceOverlapIssueSolver = class extends BaseSolver {
 };
 
 // lib/solvers/TraceOverlapShiftSolver/TraceOverlapShiftSolver.ts
+var TRACE_STATE_POSITION_EPSILON = 1e-6;
 var TraceOverlapShiftSolver = class extends BaseSolver {
   inputProblem;
   inputTracePaths;
@@ -2112,6 +2113,9 @@ var TraceOverlapShiftSolver = class extends BaseSolver {
    */
   traceNetIslands = {};
   correctedTraceMap = {};
+  // Keep only the current and previous layouts to detect a two-state cycle
+  // without accumulating routing history for the whole solve.
+  recentTraceStates = [];
   cleanupPhase = null;
   constructor(params) {
     super();
@@ -2123,6 +2127,7 @@ var TraceOverlapShiftSolver = class extends BaseSolver {
       const { mspPairId } = tracePath;
       this.correctedTraceMap[mspPairId] = tracePath;
     }
+    this.rememberTraceState(this.correctedTraceMap);
     this.traceNetIslands = this.computeTraceNetIslands();
   }
   getConstructorParams() {
@@ -2337,11 +2342,17 @@ var TraceOverlapShiftSolver = class extends BaseSolver {
   }
   _step() {
     if (this.activeSubSolver?.solved) {
-      for (const [mspPairId, newTrace] of Object.entries(
-        this.activeSubSolver.correctedTraceMap
-      )) {
-        this.correctedTraceMap[mspPairId] = newTrace;
+      const nextTraceState = {
+        ...this.correctedTraceMap,
+        ...this.activeSubSolver.correctedTraceMap
+      };
+      if (this.returnsToPreviousTraceState(nextTraceState)) {
+        this.activeSubSolver = null;
+        this.solved = true;
+        return;
       }
+      this.correctedTraceMap = nextTraceState;
+      this.rememberTraceState(nextTraceState);
       this.activeSubSolver = null;
       this.traceNetIslands = this.computeTraceNetIslands();
     }
@@ -2374,6 +2385,34 @@ var TraceOverlapShiftSolver = class extends BaseSolver {
       traceIdsToShift: this.traceIdsToShift
     });
   }
+  rememberTraceState(traceState) {
+    this.recentTraceStates.push({ ...traceState });
+    if (this.recentTraceStates.length > 2) {
+      this.recentTraceStates.shift();
+    }
+  }
+  returnsToPreviousTraceState(candidateTraceState) {
+    if (this.recentTraceStates.length < 2) return false;
+    const previousTraceState = this.recentTraceStates[0];
+    const traceIds = Object.keys(candidateTraceState);
+    if (traceIds.length !== Object.keys(previousTraceState).length) return false;
+    for (const traceId of traceIds) {
+      const candidatePath = candidateTraceState[traceId];
+      const previousPath = previousTraceState[traceId];
+      if (!candidatePath || !previousPath) return false;
+      if (candidatePath.tracePath.length !== previousPath.tracePath.length) {
+        return false;
+      }
+      for (let i = 0; i < candidatePath.tracePath.length; i++) {
+        const candidatePoint = candidatePath.tracePath[i];
+        const previousPoint = previousPath.tracePath[i];
+        if (Math.abs(candidatePoint.x - previousPoint.x) > TRACE_STATE_POSITION_EPSILON || Math.abs(candidatePoint.y - previousPoint.y) > TRACE_STATE_POSITION_EPSILON) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
   visualize() {
     if (this.activeSubSolver) {
       return this.activeSubSolver.visualize();

package/lib/solvers/TraceOverlapShiftSolver/TraceOverlapShiftSolver.ts

@@ -11,6 +11,9 @@ import {
 import type { MspConnectionPairId } from "../MspConnectionPairSolver/MspConnectionPairSolver"
 
 type ConnNetId = string
+type TraceState = Record<MspConnectionPairId, SolvedTracePath>
+
+const TRACE_STATE_POSITION_EPSILON = 1e-6
 
 /**
  * This solver finds traces that overlap or meet collinearly and aren't
@@ -44,6 +47,9 @@ export class TraceOverlapShiftSolver extends BaseSolver {
   traceNetIslands: Record<ConnNetId, Array<SolvedTracePath>> = {}
 
   correctedTraceMap: Record<MspConnectionPairId, SolvedTracePath> = {}
+  // Keep only the current and previous layouts to detect a two-state cycle
+  // without accumulating routing history for the whole solve.
+  recentTraceStates: TraceState[] = []
 
   cleanupPhase: "diagonals" | "done" | null = null
 
@@ -64,6 +70,8 @@ export class TraceOverlapShiftSolver extends BaseSolver {
       this.correctedTraceMap[mspPairId] = tracePath
     }
 
+    this.rememberTraceState(this.correctedTraceMap)
+
     this.traceNetIslands = this.computeTraceNetIslands()
   }
 
@@ -361,11 +369,19 @@ export class TraceOverlapShiftSolver extends BaseSolver {
 
   override _step() {
     if (this.activeSubSolver?.solved) {
-      for (const [mspPairId, newTrace] of Object.entries(
-        this.activeSubSolver.correctedTraceMap,
-      )) {
-        this.correctedTraceMap[mspPairId] = newTrace
+      const nextTraceState = {
+        ...this.correctedTraceMap,
+        ...this.activeSubSolver.correctedTraceMap,
       }
+      // Returning to the older retained layout means corrections are bouncing
+      // A -> B -> A. Keep B and finish this pass instead of retrying forever.
+      if (this.returnsToPreviousTraceState(nextTraceState)) {
+        this.activeSubSolver = null
+        this.solved = true
+        return
+      }
+      this.correctedTraceMap = nextTraceState
+      this.rememberTraceState(nextTraceState)
       this.activeSubSolver = null
       this.traceNetIslands = this.computeTraceNetIslands()
     }
@@ -407,6 +423,46 @@ export class TraceOverlapShiftSolver extends BaseSolver {
     })
   }
 
+  private rememberTraceState(traceState: TraceState) {
+    this.recentTraceStates.push({ ...traceState })
+    if (this.recentTraceStates.length > 2) {
+      this.recentTraceStates.shift()
+    }
+  }
+
+  private returnsToPreviousTraceState(candidateTraceState: TraceState) {
+    if (this.recentTraceStates.length < 2) return false
+
+    const previousTraceState = this.recentTraceStates[0]!
+    const traceIds = Object.keys(candidateTraceState)
+    if (traceIds.length !== Object.keys(previousTraceState).length) return false
+
+    // Corrections create new objects, so compare the trace geometry itself.
+    for (const traceId of traceIds) {
+      const candidatePath = candidateTraceState[traceId]
+      const previousPath = previousTraceState[traceId]
+      if (!candidatePath || !previousPath) return false
+      if (candidatePath.tracePath.length !== previousPath.tracePath.length) {
+        return false
+      }
+
+      for (let i = 0; i < candidatePath.tracePath.length; i++) {
+        const candidatePoint = candidatePath.tracePath[i]!
+        const previousPoint = previousPath.tracePath[i]!
+        if (
+          Math.abs(candidatePoint.x - previousPoint.x) >
+            TRACE_STATE_POSITION_EPSILON ||
+          Math.abs(candidatePoint.y - previousPoint.y) >
+            TRACE_STATE_POSITION_EPSILON
+        ) {
+          return false
+        }
+      }
+    }
+
+    return true
+  }
+
   override visualize() {
     if (this.activeSubSolver) {
       return this.activeSubSolver.visualize()

package/package.json

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