@tscircuit/curvy-trace-solver 0.0.5 → 0.0.6

package/dist/index.d.ts

@@ -16,7 +16,8 @@ interface CurvyTraceProblem {
     bounds: Bounds;
     waypointPairs: WaypointPair[];
     obstacles: Obstacle[];
-    preferredSpacing: number;
+    preferredTraceToTraceSpacing: number;
+    preferredObstacleToTraceSpacing: number;
 }
 interface OutputTrace {
     waypointPair: WaypointPair;

package/dist/index.js

@@ -1201,7 +1201,7 @@ var CurvyTraceSolver = class extends BaseSolver {
   }
   // Determine which trace pairs could possibly collide based on bounding boxes
   updateCollisionPairs() {
-    const { preferredSpacing } = this.problem;
+    const { preferredTraceToTraceSpacing: preferredSpacing } = this.problem;
     this.collisionPairs = [];
     for (let i = 0; i < this.traces.length; i++) {
       for (let j = i + 1; j < this.traces.length; j++) {
@@ -1216,8 +1216,9 @@ var CurvyTraceSolver = class extends BaseSolver {
     }
   }
   computeTotalCost() {
-    const { preferredSpacing } = this.problem;
-    const spacingSq = preferredSpacing * preferredSpacing;
+    const { preferredTraceToTraceSpacing, preferredObstacleToTraceSpacing } = this.problem;
+    const traceSpacingSq = preferredTraceToTraceSpacing ** 2;
+    const obstacleSpacingSq = preferredObstacleToTraceSpacing ** 2;
     let cost = 0;
     for (const [i, j] of this.collisionPairs) {
       const pi = this.sampledPoints[i], pj = this.sampledPoints[j];
@@ -1228,10 +1229,10 @@ var CurvyTraceSolver = class extends BaseSolver {
           const b1x = pj[b * 2], b1y = pj[b * 2 + 1];
           const b2x = pj[(b + 1) * 2], b2y = pj[(b + 1) * 2 + 1];
           const distSq = segmentDistSq(a1x, a1y, a2x, a2y, b1x, b1y, b2x, b2y);
-          if (distSq < spacingSq) {
+          if (distSq < traceSpacingSq) {
             const dist = Math.sqrt(distSq);
-            cost += (preferredSpacing - dist) ** 2;
-            if (distSq < 1e-18) cost += 20 * spacingSq;
+            cost += (preferredTraceToTraceSpacing - dist) ** 2;
+            if (distSq < 1e-18) cost += 20 * traceSpacingSq;
           }
         }
       }
@@ -1250,16 +1251,16 @@ var CurvyTraceSolver = class extends BaseSolver {
         const oy2 = this.obstacleSegments[obsBase + 3];
         const obsMinX = Math.min(ox1, ox2), obsMaxX = Math.max(ox1, ox2);
         const obsMinY = Math.min(oy1, oy2), obsMaxY = Math.max(oy1, oy2);
-        if (bi.maxX + preferredSpacing < obsMinX || obsMaxX + preferredSpacing < bi.minX || bi.maxY + preferredSpacing < obsMinY || obsMaxY + preferredSpacing < bi.minY)
+        if (bi.maxX + preferredObstacleToTraceSpacing < obsMinX || obsMaxX + preferredObstacleToTraceSpacing < bi.minX || bi.maxY + preferredObstacleToTraceSpacing < obsMinY || obsMaxY + preferredObstacleToTraceSpacing < bi.minY)
           continue;
         for (let a = 0; a < OPT_SAMPLES; a++) {
           const a1x = pi[a * 2], a1y = pi[a * 2 + 1];
           const a2x = pi[(a + 1) * 2], a2y = pi[(a + 1) * 2 + 1];
           const distSq = segmentDistSq(a1x, a1y, a2x, a2y, ox1, oy1, ox2, oy2);
-          if (distSq < spacingSq) {
+          if (distSq < obstacleSpacingSq) {
             const dist = Math.sqrt(distSq);
-            cost += (preferredSpacing - dist) ** 2;
-            if (distSq < 1e-18) cost += 20 * spacingSq;
+            cost += (preferredObstacleToTraceSpacing - dist) ** 2;
+            if (distSq < 1e-18) cost += 20 * obstacleSpacingSq;
           }
         }
       }
@@ -1267,8 +1268,9 @@ var CurvyTraceSolver = class extends BaseSolver {
     return cost;
   }
   computeCostForTrace(traceIdx) {
-    const { preferredSpacing } = this.problem;
-    const spacingSq = preferredSpacing * preferredSpacing;
+    const { preferredTraceToTraceSpacing, preferredObstacleToTraceSpacing } = this.problem;
+    const traceSpacingSq = preferredTraceToTraceSpacing ** 2;
+    const obstacleSpacingSq = preferredObstacleToTraceSpacing ** 2;
     const trace = this.traces[traceIdx];
     const pi = this.sampledPoints[traceIdx];
     const bi = this.traceBounds[traceIdx];
@@ -1279,7 +1281,7 @@ var CurvyTraceSolver = class extends BaseSolver {
       if (trace.networkId && other.networkId && trace.networkId === other.networkId)
         continue;
       const bj = this.traceBounds[j];
-      if (bi.maxX + preferredSpacing < bj.minX || bj.maxX + preferredSpacing < bi.minX || bi.maxY + preferredSpacing < bj.minY || bj.maxY + preferredSpacing < bi.minY)
+      if (bi.maxX + preferredTraceToTraceSpacing < bj.minX || bj.maxX + preferredTraceToTraceSpacing < bi.minX || bi.maxY + preferredTraceToTraceSpacing < bj.minY || bj.maxY + preferredTraceToTraceSpacing < bi.minY)
         continue;
       const pj = this.sampledPoints[j];
       for (let a = 0; a < OPT_SAMPLES; a++) {
@@ -1289,10 +1291,10 @@ var CurvyTraceSolver = class extends BaseSolver {
           const b1x = pj[b * 2], b1y = pj[b * 2 + 1];
           const b2x = pj[(b + 1) * 2], b2y = pj[(b + 1) * 2 + 1];
           const distSq = segmentDistSq(a1x, a1y, a2x, a2y, b1x, b1y, b2x, b2y);
-          if (distSq < spacingSq) {
+          if (distSq < traceSpacingSq) {
             const dist = Math.sqrt(distSq);
-            cost += (preferredSpacing - dist) ** 2;
-            if (distSq < 1e-18) cost += 20 * spacingSq;
+            cost += (preferredTraceToTraceSpacing - dist) ** 2;
+            if (distSq < 1e-18) cost += 20 * traceSpacingSq;
           }
         }
       }
@@ -1307,16 +1309,16 @@ var CurvyTraceSolver = class extends BaseSolver {
       const oy2 = this.obstacleSegments[obsBase + 3];
       const obsMinX = Math.min(ox1, ox2), obsMaxX = Math.max(ox1, ox2);
       const obsMinY = Math.min(oy1, oy2), obsMaxY = Math.max(oy1, oy2);
-      if (bi.maxX + preferredSpacing < obsMinX || obsMaxX + preferredSpacing < bi.minX || bi.maxY + preferredSpacing < obsMinY || obsMaxY + preferredSpacing < bi.minY)
+      if (bi.maxX + preferredObstacleToTraceSpacing < obsMinX || obsMaxX + preferredObstacleToTraceSpacing < bi.minX || bi.maxY + preferredObstacleToTraceSpacing < obsMinY || obsMaxY + preferredObstacleToTraceSpacing < bi.minY)
         continue;
       for (let a = 0; a < OPT_SAMPLES; a++) {
         const a1x = pi[a * 2], a1y = pi[a * 2 + 1];
         const a2x = pi[(a + 1) * 2], a2y = pi[(a + 1) * 2 + 1];
         const distSq = segmentDistSq(a1x, a1y, a2x, a2y, ox1, oy1, ox2, oy2);
-        if (distSq < spacingSq) {
+        if (distSq < obstacleSpacingSq) {
           const dist = Math.sqrt(distSq);
-          cost += (preferredSpacing - dist) ** 2;
-          if (distSq < 1e-18) cost += 20 * spacingSq;
+          cost += (preferredObstacleToTraceSpacing - dist) ** 2;
+          if (distSq < 1e-18) cost += 20 * obstacleSpacingSq;
         }
       }
     }

package/package.json

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