@tscircuit/schematic-trace-solver 0.0.33 → 0.0.35

package/tests/examples/example19.test.tsx

@@ -0,0 +1,175 @@
+import { expect } from "bun:test"
+import { test } from "bun:test"
+import { SchematicTracePipelineSolver, type InputProblem } from "lib/index"
+import "tests/fixtures/matcher"
+
+const inputProblem = {
+  chips: [
+    {
+      chipId: "schematic_component_0",
+      center: {
+        x: 0,
+        y: 0,
+      },
+      width: 0.4,
+      height: 0.8,
+      pins: [
+        {
+          pinId: "U1.6",
+          x: 0.6000000000000001,
+          y: -0.2,
+        },
+        {
+          pinId: "U1.8",
+          x: 0.6000000000000001,
+          y: 0,
+        },
+        {
+          pinId: "U1.1",
+          x: 0.6000000000000001,
+          y: 0.2,
+        },
+      ],
+    },
+    {
+      chipId: "schematic_component_1",
+      center: {
+        x: 1.4,
+        y: 0.55,
+      },
+      width: 0.5291665999999999,
+      height: 1.0583333000000001,
+      pins: [
+        {
+          pinId: "C2.1",
+          x: 1.4002733499999995,
+          y: -0.0012093000000001908,
+        },
+        {
+          pinId: "C2.2",
+          x: 1.3997266500000003,
+          y: 1.1012093000000003,
+        },
+      ],
+    },
+    {
+      chipId: "schematic_component_2",
+      center: {
+        x: 2.7,
+        y: 1.3,
+      },
+      width: 1.0583332999999997,
+      height: 0.388910699999999,
+      pins: [
+        {
+          pinId: "R1.1",
+          x: 2.1487093,
+          y: 1.3002732499999994,
+        },
+        {
+          pinId: "R1.2",
+          x: 3.2512907000000006,
+          y: 1.2997267500000007,
+        },
+      ],
+    },
+    {
+      chipId: "schematic_component_3",
+      center: {
+        x: 4.4,
+        y: 0,
+      },
+      width: 0.4,
+      height: 0.4,
+      pins: [
+        {
+          pinId: "JP5.1",
+          x: 3.8000000000000003,
+          y: 0,
+        },
+      ],
+    },
+    {
+      chipId: "schematic_component_4",
+      center: {
+        x: 4.4,
+        y: -0.9,
+      },
+      width: 0.4,
+      height: 0.4,
+      pins: [
+        {
+          pinId: "JP9.1",
+          x: 3.8000000000000003,
+          y: -0.9,
+        },
+      ],
+    },
+    {
+      chipId: "schematic_component_5",
+      center: {
+        x: 2,
+        y: -1.1,
+      },
+      width: 0.8843008999999997,
+      height: 0.5299361999999987,
+      pins: [
+        {
+          pinId: "JP8.1",
+          x: 2.4458007999999998,
+          y: -1.2015872704999997,
+        },
+        {
+          pinId: "JP8.2",
+          x: 2.0034928,
+          y: -0.8474009705000005,
+        },
+        {
+          pinId: "JP8.3",
+          x: 1.5541992,
+          y: -1.2014628704999997,
+        },
+      ],
+    },
+  ],
+  directConnections: [
+    {
+      pinIds: ["C2.1", "U1.8"],
+      netId: "capacitor.C2 > port.pin1 to .U1 > .pin8",
+    },
+    {
+      pinIds: ["C2.2", "R1.1"],
+      netId: "capacitor.C2 > port.pin2 to .R1 > .pin1",
+    },
+    {
+      pinIds: ["R1.1", "U1.1"],
+      netId: "resistor.R1 > port.pin1 to .U1 > .pin1",
+    },
+    {
+      pinIds: ["JP5.1", "R1.2"],
+      netId: "pinheader.JP5 > port.pin1 to .R1 > .pin2",
+    },
+    {
+      pinIds: ["JP9.1", "R1.2"],
+      netId: "pinheader.JP9 > port.pin1 to .R1 > .pin2",
+    },
+    {
+      pinIds: ["JP8.2", "U1.6"],
+      netId: "solderjumper.JP8 > port.pin2 to .U1 > .pin6",
+    },
+  ],
+  netConnections: [
+    {
+      netId: "PAD",
+      pinIds: ["R1.2", "JP5.1", "JP9.1"],
+    },
+  ],
+  availableNetLabelOrientations: {},
+  maxMspPairDistance: 5,
+} as InputProblem
+
+test("example19", () => {
+  const solver = new SchematicTracePipelineSolver(inputProblem)
+  solver.solve()
+  expect(solver).toMatchSolverSnapshot(import.meta.path)
+})

package/tests/fixtures/matcher.ts

@@ -25,21 +25,23 @@ async function toMatchSolverSnapshot(
     return Math.max(acc, elm.step ?? 0)
   }, 0)
 
-  graphicsObject.points = graphicsObject.points?.filter(
-    (p) => p.step === lastStep,
-  )
-  graphicsObject.lines = graphicsObject.lines?.filter(
-    (l) => l.step === lastStep,
-  )
-  graphicsObject.rects = graphicsObject.rects?.filter(
-    (r) => r.step === lastStep,
-  )
-  graphicsObject.circles = graphicsObject.circles?.filter(
-    (c) => c.step === lastStep,
-  )
-  graphicsObject.texts = graphicsObject.texts?.filter(
-    (t) => t.step === lastStep,
-  )
+  if (lastStep !== 0) {
+    graphicsObject.points = graphicsObject.points?.filter(
+      (p) => p.step === lastStep,
+    )
+    graphicsObject.lines = graphicsObject.lines?.filter(
+      (l) => l.step === lastStep,
+    )
+    graphicsObject.rects = graphicsObject.rects?.filter(
+      (r) => r.step === lastStep,
+    )
+    graphicsObject.circles = graphicsObject.circles?.filter(
+      (c) => c.step === lastStep,
+    )
+    graphicsObject.texts = graphicsObject.texts?.filter(
+      (t) => t.step === lastStep,
+    )
+  }
 
   const svg = getSvgFromGraphicsObject(graphicsObject, {
     backgroundColor: "white",

package/tests/fixtures/preload.ts

@@ -1 +1,2 @@
 import "bun-match-svg"
+import "tests/fixtures/matcher"

package/tests/solvers/SchematicTraceSingleLineSolver/SchematicTraceSingleLineSolver_repro01.test.ts

@@ -2,7 +2,7 @@ import { test, expect } from "bun:test"
 import input from "./SchematicTraceSingleLineSolver_repro01.json"
 import { SchematicTraceSingleLineSolver } from "lib/solvers/SchematicTraceLinesSolver/SchematicTraceSingleLineSolver/SchematicTraceSingleLineSolver"
 
-test("SchematicTraceSingleLineSolver_repro01", () => {
+test.skip("SchematicTraceSingleLineSolver_repro01", () => {
   const solver = new SchematicTraceSingleLineSolver(input as any)
   solver.solve()
 

package/tests/solvers/SchematicTraceSingleLineSolver2/SchematicTraceSingleLineSolver2_01-example17-d1_1-u1_1.test.ts

@@ -0,0 +1,323 @@
+import { SchematicTraceSingleLineSolver2 } from "lib/solvers/SchematicTraceLinesSolver/SchematicTraceSingleLineSolver2/SchematicTraceSingleLineSolver2"
+import { test, expect } from "bun:test"
+
+test("SchematicTraceSingleLineSolver2 should solve problem correctly", () => {
+  const input = {
+    chipMap: {
+      schematic_component_0: {
+        chipId: "schematic_component_0",
+        center: {
+          x: 0,
+          y: 0,
+        },
+        width: 2.3,
+        height: 1,
+        pins: [
+          {
+            pinId: "U1.1",
+            x: -1.15,
+            y: 0.30000000000000004,
+          },
+          {
+            pinId: "U1.2",
+            x: -1.15,
+            y: 0.10000000000000003,
+          },
+          {
+            pinId: "U1.3",
+            x: -1.15,
+            y: -0.09999999999999998,
+          },
+          {
+            pinId: "U1.4",
+            x: -1.15,
+            y: -0.30000000000000004,
+          },
+          {
+            pinId: "U1.5",
+            x: 1.15,
+            y: -0.30000000000000004,
+          },
+          {
+            pinId: "U1.6",
+            x: 1.15,
+            y: -0.10000000000000003,
+          },
+          {
+            pinId: "U1.7",
+            x: 1.15,
+            y: 0.09999999999999998,
+          },
+          {
+            pinId: "U1.8",
+            x: 1.15,
+            y: 0.30000000000000004,
+          },
+        ],
+      },
+      schematic_component_1: {
+        chipId: "schematic_component_1",
+        center: {
+          x: -1.1500000000000004,
+          y: 1.6700000000000002,
+        },
+        width: 1.04,
+        height: 1.0400000000000005,
+        pins: [
+          {
+            pinId: "D1.1",
+            x: -1.1500000000000004,
+            y: 1.15,
+          },
+          {
+            pinId: "D1.2",
+            x: -1.1500000000000004,
+            y: 2.1900000000000004,
+          },
+        ],
+      },
+      schematic_component_2: {
+        chipId: "schematic_component_2",
+        center: {
+          x: -2.37,
+          y: 0.10000000000000009,
+        },
+        width: 1.04,
+        height: 0.54,
+        pins: [
+          {
+            pinId: "D2.1",
+            x: -1.85,
+            y: 0.10000000000000002,
+          },
+          {
+            pinId: "D2.2",
+            x: -2.89,
+            y: 0.10000000000000016,
+          },
+        ],
+      },
+      schematic_component_3: {
+        chipId: "schematic_component_3",
+        center: {
+          x: 2.4,
+          y: -0.3000000000000007,
+        },
+        width: 1.1000000000000005,
+        height: 0.84,
+        pins: [
+          {
+            pinId: "C1.1",
+            x: 1.8499999999999996,
+            y: -0.3000000000000007,
+          },
+          {
+            pinId: "C1.2",
+            x: 2.95,
+            y: -0.3000000000000007,
+          },
+        ],
+      },
+      schematic_component_4: {
+        chipId: "schematic_component_4",
+        center: {
+          x: 4.2,
+          y: -0.3000000000000007,
+        },
+        width: 1.0999999999999996,
+        height: 0.84,
+        pins: [
+          {
+            pinId: "C2.1",
+            x: 3.6500000000000004,
+            y: -0.3000000000000007,
+          },
+          {
+            pinId: "C2.2",
+            x: 4.75,
+            y: -0.3000000000000007,
+          },
+        ],
+      },
+    },
+    pins: [
+      {
+        pinId: "U1.1",
+        x: -1.15,
+        y: 0.30000000000000004,
+        chipId: "schematic_component_0",
+      },
+      {
+        pinId: "D1.1",
+        x: -1.1500000000000004,
+        y: 1.15,
+        chipId: "schematic_component_1",
+      },
+    ],
+    inputProblem: {
+      chips: [
+        {
+          chipId: "schematic_component_0",
+          center: {
+            x: 0,
+            y: 0,
+          },
+          width: 2.3,
+          height: 1,
+          pins: [
+            {
+              pinId: "U1.1",
+              x: -1.15,
+              y: 0.30000000000000004,
+            },
+            {
+              pinId: "U1.2",
+              x: -1.15,
+              y: 0.10000000000000003,
+            },
+            {
+              pinId: "U1.3",
+              x: -1.15,
+              y: -0.09999999999999998,
+            },
+            {
+              pinId: "U1.4",
+              x: -1.15,
+              y: -0.30000000000000004,
+            },
+            {
+              pinId: "U1.5",
+              x: 1.15,
+              y: -0.30000000000000004,
+            },
+            {
+              pinId: "U1.6",
+              x: 1.15,
+              y: -0.10000000000000003,
+            },
+            {
+              pinId: "U1.7",
+              x: 1.15,
+              y: 0.09999999999999998,
+            },
+            {
+              pinId: "U1.8",
+              x: 1.15,
+              y: 0.30000000000000004,
+            },
+          ],
+        },
+        {
+          chipId: "schematic_component_1",
+          center: {
+            x: -1.1500000000000004,
+            y: 1.6700000000000002,
+          },
+          width: 1.04,
+          height: 1.0400000000000005,
+          pins: [
+            {
+              pinId: "D1.1",
+              x: -1.1500000000000004,
+              y: 1.15,
+            },
+            {
+              pinId: "D1.2",
+              x: -1.1500000000000004,
+              y: 2.1900000000000004,
+            },
+          ],
+        },
+        {
+          chipId: "schematic_component_2",
+          center: {
+            x: -2.37,
+            y: 0.10000000000000009,
+          },
+          width: 1.04,
+          height: 0.54,
+          pins: [
+            {
+              pinId: "D2.1",
+              x: -1.85,
+              y: 0.10000000000000002,
+            },
+            {
+              pinId: "D2.2",
+              x: -2.89,
+              y: 0.10000000000000016,
+            },
+          ],
+        },
+        {
+          chipId: "schematic_component_3",
+          center: {
+            x: 2.4,
+            y: -0.3000000000000007,
+          },
+          width: 1.1000000000000005,
+          height: 0.84,
+          pins: [
+            {
+              pinId: "C1.1",
+              x: 1.8499999999999996,
+              y: -0.3000000000000007,
+            },
+            {
+              pinId: "C1.2",
+              x: 2.95,
+              y: -0.3000000000000007,
+            },
+          ],
+        },
+        {
+          chipId: "schematic_component_4",
+          center: {
+            x: 4.2,
+            y: -0.3000000000000007,
+          },
+          width: 1.0999999999999996,
+          height: 0.84,
+          pins: [
+            {
+              pinId: "C2.1",
+              x: 3.6500000000000004,
+              y: -0.3000000000000007,
+            },
+            {
+              pinId: "C2.2",
+              x: 4.75,
+              y: -0.3000000000000007,
+            },
+          ],
+        },
+      ],
+      directConnections: [
+        {
+          pinIds: ["U1.5", "C1.1"],
+          netId: ".U1 .VCC to .C1 .pin1",
+        },
+        {
+          pinIds: ["C1.2", "C2.1"],
+          netId: ".C1 .pin2 to .C2 .pin1",
+        },
+        {
+          pinIds: ["U1.1", "D1.1"],
+          netId: ".U1 .OUT1 to .D1 .pin1",
+        },
+        {
+          pinIds: ["U1.2", "D2.1"],
+          netId: ".U1 .OUT2 to .D2 .pin1",
+        },
+      ],
+      netConnections: [],
+      availableNetLabelOrientations: {},
+      maxMspPairDistance: 2.4,
+    },
+  }
+
+  const solver = new SchematicTraceSingleLineSolver2(input as any)
+  solver.solve()
+
+  expect(solver).toMatchSolverSnapshot(import.meta.path)
+})