@tscircuit/core 0.0.2291 → 0.0.2293

package/dist/index.js

@@ -114681,6 +114681,12 @@ function* expandedSignalSites({
     );
     if (!Number.isFinite(pitch)) continue;
     const surfaceLimit = Math.min(2, 2.5 * pitch);
+    const pitchSteps = Math.max(
+      2,
+      2 * Math.ceil(pitch / Math.max(0.01, input.minTraceWidth / 2) / 2)
+    );
+    const surfaceStep = Math.max(0.01, pitch / pitchSteps);
+    const surfaceRadius = Math.ceil(surfaceLimit / surfaceStep) * surfaceStep;
     const candidates = [];
     for (let ix2 = -5; ix2 <= 5; ix2++)
       for (let iy2 = -5; iy2 <= 5; iy2++) {
@@ -114729,86 +114735,99 @@ function* expandedSignalSites({
         fixed
       )
     );
-    for (const [index2, point52] of candidates.entries()) {
-      if (index2 === gridCandidateCount && ends[end].length) break;
-      if (viaScenes.some((scene2) => !scene2.visible(point52, point52))) continue;
-      if (existingVias.some(
-        (via) => distance15(via, point52) < hole / 2 + (via.via_hole_diameter ?? input.minViaHoleDiameter ?? 0.15) / 2 + holeClearance - 1e-8
-      ))
-        continue;
-      const local = {
-        ...connection,
-        pointsToConnect: [pad, { ...point52, layer: pad.layer }]
-      };
-      const scene = new VectorScene(input, local, width, fixed);
-      const search = new GridVisibilitySearch(
-        scene,
-        pad,
-        point52,
-        [],
-        0,
-        void 0,
-        {
-          checkReachability: true,
-          allTerminalAttachments: true,
-          maxLength: surfaceLimit,
-          paretoLength: true
-        }
-      );
-      try {
-        let steps = 0;
-        while (!search.solved && !search.failed && steps++ < 4e3) {
-          search.step();
-          yield;
-        }
-        if (!search.solved) continue;
-        let top = reduceOrdinaryTurns(search.result, scene).map((p2) => ({
-          ...p2,
-          route_type: "wire",
-          layer: pad.layer,
-          width
-        }));
-        const topTrace = {
-          type: "pcb_trace",
-          pcb_trace_id: `expanded_surface_${connection.name}_${end}`,
-          connection_name: connection.name,
-          route: top
-        };
-        top = chamferOrdinaryCorners(
-          { ...input, connections: [local] },
-          [topTrace],
-          fixed
-        )[0].route;
-        if (!scene.pathVisible(top) || length(top) > surfaceLimit + 1e-8 || !routeAnglesAreConventional([{ ...topTrace, route: top }]) || !tuningPathIsSelfClear(
-          top,
-          width + (input.minTraceToPadEdgeClearance ?? input.defaultObstacleMargin ?? 0.075)
+    for (const alignSurfaceGrid of [false, true]) {
+      if (alignSurfaceGrid && ends[end].length) break;
+      const surfaceGrid = alignSurfaceGrid ? {
+        step: surfaceStep,
+        bounds: {
+          minX: pad.x - surfaceRadius,
+          maxX: pad.x + surfaceRadius,
+          minY: pad.y - surfaceRadius,
+          maxY: pad.y + surfaceRadius
+        }
+      } : {};
+      for (const [index2, point52] of candidates.entries()) {
+        if (index2 === gridCandidateCount && ends[end].length) break;
+        if (viaScenes.some((scene2) => !scene2.visible(point52, point52))) continue;
+        if (existingVias.some(
+          (via) => distance15(via, point52) < hole / 2 + (via.via_hole_diameter ?? input.minViaHoleDiameter ?? 0.15) / 2 + holeClearance - 1e-8
         ))
           continue;
-        const via = {
-          x: point52.x,
-          y: point52.y,
-          route_type: "via",
-          from_layer: pad.layer,
-          to_layer: targetLayer2,
-          layers: physical,
-          via_diameter: diameter,
-          via_hole_diameter: hole
+        const local = {
+          ...connection,
+          pointsToConnect: [pad, { ...point52, layer: pad.layer }]
         };
-        ends[end].push({
-          point: point52,
-          length: length(top),
-          escape: {
+        const scene = new VectorScene(input, local, width, fixed);
+        const search = new GridVisibilitySearch(
+          scene,
+          pad,
+          point52,
+          [],
+          0,
+          void 0,
+          {
+            ...surfaceGrid,
+            checkReachability: true,
+            allTerminalAttachments: true,
+            maxLength: surfaceLimit,
+            paretoLength: true
+          }
+        );
+        try {
+          let steps = 0;
+          while (!search.solved && !search.failed && steps++ < 4e3) {
+            search.step();
+            yield;
+          }
+          if (!search.solved) continue;
+          let top = reduceOrdinaryTurns(search.result, scene).map((p2) => ({
+            ...p2,
+            route_type: "wire",
+            layer: pad.layer,
+            width
+          }));
+          const topTrace = {
             type: "pcb_trace",
-            pcb_trace_id: `expanded_dogbone_${connection.name}_${end}_${ends[end].length}`,
+            pcb_trace_id: `expanded_surface_${connection.name}_${end}`,
             connection_name: connection.name,
-            source_trace_id: connection.source_trace_id ?? connection.name,
-            route: [...top, via, { ...point52, route_type: "wire", width }]
-          }
-        });
-      } finally {
-        search.cancel();
+            route: top
+          };
+          top = chamferOrdinaryCorners(
+            { ...input, connections: [local] },
+            [topTrace],
+            fixed
+          )[0].route;
+          if (!scene.pathVisible(top) || length(top) > surfaceLimit + 1e-8 || !routeAnglesAreConventional([{ ...topTrace, route: top }]) || !tuningPathIsSelfClear(
+            top,
+            width + (input.minTraceToPadEdgeClearance ?? input.defaultObstacleMargin ?? 0.075)
+          ))
+            continue;
+          const via = {
+            x: point52.x,
+            y: point52.y,
+            route_type: "via",
+            from_layer: pad.layer,
+            to_layer: targetLayer2,
+            layers: physical,
+            via_diameter: diameter,
+            via_hole_diameter: hole
+          };
+          ends[end].push({
+            point: point52,
+            length: length(top),
+            escape: {
+              type: "pcb_trace",
+              pcb_trace_id: `expanded_dogbone_${connection.name}_${end}_${ends[end].length}`,
+              connection_name: connection.name,
+              source_trace_id: connection.source_trace_id ?? connection.name,
+              route: [...top, via, { ...point52, route_type: "wire", width }]
+            }
+          });
+        } finally {
+          search.cancel();
+        }
+        yield;
       }
-      yield;
     }
   }
   return ends;
@@ -158580,7 +158599,7 @@ var RoutingPhasePreparationError = class extends Error {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.2290",
+  version: "0.0.2292",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -158607,7 +158626,8 @@ var package_default = {
     "build:benchmarking": "bun build --experimental-html ./benchmarking/website/index.html --outdir ./benchmarking-dist",
     "build:benchmarking:watch": `chokidar "./{benchmarking,lib}/**/*.{ts,tsx}" -c 'bun build --experimental-html ./benchmarking/website/index.html --outdir ./benchmarking-dist'`,
     "start:benchmarking": 'concurrently "bun run build:benchmarking:watch" "live-server ./benchmarking-dist"',
-    "generate-test-plan": "bun run scripts/generate-test-plan.ts"
+    "generate-test-plan": "bun run scripts/generate-test-plan.ts",
+    "benchmark:ddr": "bun scripts/benchmark-ddr/run.ts"
   },
   devDependencies: {
     "@tscircuit/cad-collision-checking": "https://jscdn.tscircuit.com/@tscircuit/cad-collision-checking/0.0.6.tgz",
@@ -158617,7 +158637,7 @@ var package_default = {
     "@tsci/tscircuit.ti": "github:tscircuit/ti#57e314be4b2b06bc546d4def7453e619604d1157",
     "@tscircuit/alphabet": "0.0.25",
     "@tscircuit/bga-fanout-solver": "github:tscircuit/bga-fanout-solver#247c835cb8d69b65e53891dcf869731079415b39",
-    "@tscircuit/bus-lanes-solver": "https://jscdn.tscircuit.com/@tscircuit/bus-lanes-solver/0.0.47.tgz",
+    "@tscircuit/bus-lanes-solver": "https://jscdn.tscircuit.com/@tscircuit/bus-lanes-solver/0.0.48.tgz",
     "@tscircuit/cableprinter": "^0.0.6",
     "@tscircuit/capacity-autorouter": "^0.0.1051",
     "@tscircuit/checks": "^0.0.268",
@@ -158700,7 +158720,8 @@ var package_default = {
     "circuit-json-to-tscircuit": "^0.0.50",
     "dsn-converter": "^0.0.90",
     easyeda: "^0.0.389",
-    "circuit-json-to-pnp-csv": "^0.0.20"
+    "circuit-json-to-pnp-csv": "^0.0.20",
+    "@tscircuit/core-ddr-benchmark": "github:ShiboSoftwareDev/core-ddr-benchmark#9a7f3b9ff4e37b5d11c8572b75c5b83339a97168"
   },
   peerDependencies: {
     "@tscircuit/capacity-autorouter": "*",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.2291",
+  "version": "0.0.2293",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -28,7 +28,8 @@
     "build:benchmarking": "bun build --experimental-html ./benchmarking/website/index.html --outdir ./benchmarking-dist",
     "build:benchmarking:watch": "chokidar \"./{benchmarking,lib}/**/*.{ts,tsx}\" -c 'bun build --experimental-html ./benchmarking/website/index.html --outdir ./benchmarking-dist'",
     "start:benchmarking": "concurrently \"bun run build:benchmarking:watch\" \"live-server ./benchmarking-dist\"",
-    "generate-test-plan": "bun run scripts/generate-test-plan.ts"
+    "generate-test-plan": "bun run scripts/generate-test-plan.ts",
+    "benchmark:ddr": "bun scripts/benchmark-ddr/run.ts"
   },
   "devDependencies": {
     "@tscircuit/cad-collision-checking": "https://jscdn.tscircuit.com/@tscircuit/cad-collision-checking/0.0.6.tgz",
@@ -38,7 +39,7 @@
     "@tsci/tscircuit.ti": "github:tscircuit/ti#57e314be4b2b06bc546d4def7453e619604d1157",
     "@tscircuit/alphabet": "0.0.25",
     "@tscircuit/bga-fanout-solver": "github:tscircuit/bga-fanout-solver#247c835cb8d69b65e53891dcf869731079415b39",
-    "@tscircuit/bus-lanes-solver": "https://jscdn.tscircuit.com/@tscircuit/bus-lanes-solver/0.0.47.tgz",
+    "@tscircuit/bus-lanes-solver": "https://jscdn.tscircuit.com/@tscircuit/bus-lanes-solver/0.0.48.tgz",
     "@tscircuit/cableprinter": "^0.0.6",
     "@tscircuit/capacity-autorouter": "^0.0.1051",
     "@tscircuit/checks": "^0.0.268",
@@ -121,7 +122,8 @@
     "circuit-json-to-tscircuit": "^0.0.50",
     "dsn-converter": "^0.0.90",
     "easyeda": "^0.0.389",
-    "circuit-json-to-pnp-csv": "^0.0.20"
+    "circuit-json-to-pnp-csv": "^0.0.20",
+    "@tscircuit/core-ddr-benchmark": "github:ShiboSoftwareDev/core-ddr-benchmark#9a7f3b9ff4e37b5d11c8572b75c5b83339a97168"
   },
   "peerDependencies": {
     "@tscircuit/capacity-autorouter": "*",