@tscircuit/schematic-trace-solver 0.0.48 → 0.0.49

package/site/TraceLabelOverlapAvoidanceSolver/TraceLabelOverlapAvoidanceSolver.page.tsx

@@ -0,0 +1,146 @@
+import { useMemo } from "react"
+import { GenericSolverDebugger } from "site/components/GenericSolverDebugger"
+import { TraceLabelOverlapAvoidanceSolver } from "lib/solvers/TraceLabelOverlapAvoidanceSolver/TraceLabelOverlapAvoidanceSolver"
+import type { InputProblem } from "lib/types/InputProblem"
+import testInput from "../../tests/assets/TraceLabelOverlapAvoidanceSolver.test.input.json"
+
+const inputProblem: InputProblem = {
+  chips: [
+    {
+      chipId: "schematic_component_0",
+      center: { x: -5, y: 2 },
+      width: 0.6394553499999995,
+      height: 1.08,
+      pins: [
+        { pinId: "V1.1", x: -5.005, y: 2.54 },
+        { pinId: "V1.2", x: -4.995, y: 1.46 },
+      ],
+    },
+    {
+      chipId: "schematic_component_1",
+      center: { x: 0, y: 3 },
+      width: 1.16,
+      height: 0.46,
+      pins: [
+        { pinId: "L1.1", x: -0.55, y: 2.98 },
+        { pinId: "L1.2", x: 0.55, y: 2.97 },
+      ],
+    },
+    {
+      chipId: "schematic_component_2",
+      center: { x: 3, y: 3 },
+      width: 1.04,
+      height: 0.54,
+      pins: [
+        { pinId: "D1.1", x: 2.48, y: 3 },
+        { pinId: "D1.2", x: 3.52, y: 3 },
+      ],
+    },
+    {
+      chipId: "schematic_component_3",
+      center: { x: 3, y: 0 },
+      width: 0.5700000000000001,
+      height: 0.99,
+      pins: [
+        { pinId: "C1.2", x: 3, y: -0.49500000000000005 },
+        { pinId: "C1.1", x: 3, y: 0.495 },
+      ],
+    },
+    {
+      chipId: "schematic_component_4",
+      center: { x: 6, y: 0 },
+      width: 0.3194553499999995,
+      height: 1.1,
+      pins: [
+        { pinId: "R1.1", x: 6, y: 0.5499999999999999 },
+        { pinId: "R1.2", x: 6, y: -0.55 },
+      ],
+    },
+    {
+      chipId: "schematic_component_5",
+      center: { x: -3, y: 0 },
+      width: 0.39624869999999945,
+      height: 0.8916016,
+      pins: [
+        { pinId: "V2.1", x: -2.9999378, y: 0.4458008 },
+        { pinId: "V2.2", x: -3.0000622, y: -0.4458008 },
+      ],
+    },
+    {
+      chipId: "schematic_component_6",
+      center: { x: 0, y: 0 },
+      width: 0.89,
+      height: 1.16,
+      pins: [
+        { pinId: "M1.1", x: 0.3, y: 0.55 },
+        { pinId: "M1.2", x: 0.31, y: -0.55 },
+        { pinId: "M1.3", x: -0.42, y: -0.1 },
+      ],
+    },
+  ],
+  directConnections: [
+    {
+      pinIds: ["V1.1", "L1.1"],
+      netId: ".V1 > .pin1 to .L1 > .pin1",
+    },
+    {
+      pinIds: ["L1.2", "D1.1"],
+      netId: ".L1 > .pin2 to .D1 > .anode",
+    },
+    {
+      pinIds: ["D1.2", "C1.1"],
+      netId: ".D1 > .cathode to .C1 > .pin1",
+    },
+    {
+      pinIds: ["D1.2", "R1.1"],
+      netId: ".D1 > .cathode to .R1 > .pin1",
+    },
+    {
+      pinIds: ["C1.2", "R1.2"],
+      netId: ".C1 > .pin2 to .R1 > .pin2",
+    },
+    {
+      pinIds: ["R1.2", "V1.2"],
+      netId: ".R1 > .pin2 to .V1 > .pin2",
+    },
+    {
+      pinIds: ["L1.2", "M1.1"],
+      netId: ".L1 > .pin2 to .M1 > .drain",
+    },
+    {
+      pinIds: ["M1.2", "V1.2"],
+      netId: ".M1 > .source to .V1 > .pin2",
+    },
+    {
+      pinIds: ["M1.3", "V2.1"],
+      netId: ".M1 > .gate to .V2 > .pin1",
+    },
+    {
+      pinIds: ["V2.2", "V1.2"],
+      netId: ".V2 > .pin2 to .V1 > .pin2",
+    },
+  ],
+  netConnections: [
+    {
+      netId: "GND",
+      pinIds: ["V1.2", "C1.2", "R1.2", "V2.2", "M1.2"],
+      netLabelWidth: 0.3,
+    },
+  ],
+  availableNetLabelOrientations: { GND: ["y-"] },
+  maxMspPairDistance: 2.4,
+}
+
+export default () => {
+  const solver = useMemo(
+    () =>
+      new TraceLabelOverlapAvoidanceSolver({
+        inputProblem: inputProblem as any,
+        netLabelPlacements: testInput.netLabelPlacements as any,
+        traces: testInput.traces as any,
+      }),
+    [],
+  )
+
+  return <GenericSolverDebugger solver={solver} />
+}

package/site/TraceLabelOverlapAvoidanceSolver/renderComparisonView01.page.tsx

@@ -0,0 +1,32 @@
+import { useMemo } from "react"
+import { InteractiveGraphics } from "graphics-debug/react"
+import { stackGraphicsHorizontally } from "graphics-debug"
+import { NetLabelPlacementSolver } from "lib/solvers/NetLabelPlacementSolver/NetLabelPlacementSolver"
+import { MergedNetLabelObstacleSolver } from "lib/solvers/TraceLabelOverlapAvoidanceSolver/sub-solvers/LabelMergingSolver/LabelMergingSolver"
+import inputData from "../../tests/assets/1.input.json"
+
+export default () => {
+  const graphics = useMemo(() => {
+    const mergedNetLabelObstacleSolver = new MergedNetLabelObstacleSolver(
+      inputData.mergedNetLabelObstacleSolver as any,
+    )
+    const netLabelPlacementSolver = new NetLabelPlacementSolver(
+      inputData.netLabelPlacementSolver as any,
+    )
+
+    mergedNetLabelObstacleSolver.solve()
+    netLabelPlacementSolver.solve()
+
+    return stackGraphicsHorizontally(
+      [
+        netLabelPlacementSolver.visualize(),
+        mergedNetLabelObstacleSolver.visualize(),
+      ],
+      {
+        titles: ["NetLabelPlacementSolver", "MergedNetLabelObstacles"],
+      },
+    )
+  }, [])
+
+  return <InteractiveGraphics graphics={graphics} />
+}

package/site/TraceLabelOverlapAvoidanceSolver/renderComparisonView02.page.tsx

@@ -0,0 +1,32 @@
+import { useMemo } from "react"
+import { InteractiveGraphics } from "graphics-debug/react"
+import { stackGraphicsHorizontally } from "graphics-debug"
+import { MergedNetLabelObstacleSolver } from "lib/solvers/TraceLabelOverlapAvoidanceSolver/sub-solvers/LabelMergingSolver/LabelMergingSolver"
+import { SingleOverlapSolver } from "lib/solvers/TraceLabelOverlapAvoidanceSolver/sub-solvers/SingleOverlapSolver/SingleOverlapSolver"
+import inputData from "../../tests/assets/2.input.json"
+
+export default () => {
+  const graphics = useMemo(() => {
+    const mergedNetLabelObstacleSolver = new MergedNetLabelObstacleSolver(
+      inputData.mergedNetLabelObstacleSolver as any,
+    )
+    const singleOverlapSolver = new SingleOverlapSolver(
+      inputData.singleOverlapSolver as any,
+    )
+
+    mergedNetLabelObstacleSolver.solve()
+    singleOverlapSolver.solve()
+
+    return stackGraphicsHorizontally(
+      [
+        mergedNetLabelObstacleSolver.visualize(),
+        singleOverlapSolver.visualize(),
+      ],
+      {
+        titles: ["MergedNetLabelObstaclesSolver", "SingleOverlapSolver"],
+      },
+    )
+  }, [])
+
+  return <InteractiveGraphics graphics={graphics} />
+}

package/site/TraceLabelOverlapAvoidanceSolver/renderComparisonView03.page.tsx

@@ -0,0 +1,35 @@
+import { useMemo } from "react"
+import { InteractiveGraphics } from "graphics-debug/react"
+import { stackGraphicsHorizontally } from "graphics-debug"
+import { TraceCleanupSolver } from "lib/solvers/TraceCleanupSolver/TraceCleanupSolver"
+import { SingleOverlapSolver } from "lib/solvers/TraceLabelOverlapAvoidanceSolver/sub-solvers/SingleOverlapSolver/SingleOverlapSolver"
+import inputData from "../../tests/assets/3.input.json"
+
+export default () => {
+  const graphics = useMemo(() => {
+    const traceCleanupSolver = new TraceCleanupSolver({
+      ...inputData.traceCleanupSolver,
+      targetTraceIds: new Set(inputData.traceCleanupSolver.targetTraceIds),
+      mergedLabelNetIdMap: Object.fromEntries(
+        Object.entries(inputData.traceCleanupSolver.mergedLabelNetIdMap).map(
+          ([key, value]) => [key, new Set(value as any)],
+        ),
+      ),
+    } as any)
+    const singleOverlapSolver = new SingleOverlapSolver(
+      inputData.singleOverlapSolver as any,
+    )
+
+    traceCleanupSolver.solve()
+    singleOverlapSolver.solve()
+
+    return stackGraphicsHorizontally(
+      [singleOverlapSolver.visualize(), traceCleanupSolver.visualize()],
+      {
+        titles: ["SingleOverlapSolver", "TraceCleanupSolver"],
+      },
+    )
+  }, [])
+
+  return <InteractiveGraphics graphics={graphics} />
+}

package/site/examples/example01.page.tsx

@@ -0,0 +1,6 @@
+import { PipelineDebugger } from "site/components/PipelineDebugger"
+import inputProblem from "../../tests/assets/example01.json"
+
+export { inputProblem }
+
+export default () => <PipelineDebugger inputProblem={inputProblem as any} />

package/site/examples/example02.page.tsx

@@ -1,182 +1,6 @@
 import { PipelineDebugger } from "site/components/PipelineDebugger"
-import type { InputProblem } from "lib/types/InputProblem"
-export const inputProblem: InputProblem = {
-  chips: [
-    {
-      chipId: "schematic_component_0",
-      center: {
-        x: -1.9145832999999999,
-        y: 0.5512093000000002,
-      },
-      width: 0.5291665999999999,
-      height: 1.0583333000000001,
-      pins: [
-        {
-          pinId: "C6.1",
-          x: -1.9148566499999995,
-          y: 1.1024186000000005,
-        },
-        {
-          pinId: "C6.2",
-          x: -1.9143099500000003,
-          y: 0,
-        },
-      ],
-    },
-    {
-      chipId: "schematic_component_1",
-      center: {
-        x: -4.1729164999999995,
-        y: 0.5512093,
-      },
-      width: 0.5291665999999999,
-      height: 1.0583333000000001,
-      pins: [
-        {
-          pinId: "C1.1",
-          x: -4.173189849999999,
-          y: 1.1024186000000002,
-        },
-        {
-          pinId: "C1.2",
-          x: -4.17264315,
-          y: -2.220446049250313e-16,
-        },
-      ],
-    },
-    {
-      chipId: "schematic_component_2",
-      center: {
-        x: -3.0437499,
-        y: 0.5512093,
-      },
-      width: 0.5291665999999999,
-      height: 1.0583333000000001,
-      pins: [
-        {
-          pinId: "C2.1",
-          x: -3.0440232499999995,
-          y: 1.1024186000000002,
-        },
-        {
-          pinId: "C2.2",
-          x: -3.0434765500000003,
-          y: -2.220446049250313e-16,
-        },
-      ],
-    },
-    {
-      chipId: "schematic_component_3",
-      center: {
-        x: 1.9145832999999999,
-        y: -0.4512093000000006,
-      },
-      width: 0.5291665999999999,
-      height: 1.0583333000000001,
-      pins: [
-        {
-          pinId: "C5.1",
-          x: 1.9143099500000003,
-          y: 0.09999999999999964,
-        },
-        {
-          pinId: "C5.2",
-          x: 1.9148566499999995,
-          y: -1.0024186000000008,
-        },
-      ],
-    },
-    {
-      chipId: "schematic_component_4",
-      center: {
-        x: 0,
-        y: 0,
-      },
-      width: 1.2000000000000002,
-      height: 0.8,
-      pins: [
-        {
-          pinId: "U1.1",
-          x: -1,
-          y: 0.2,
-        },
-        {
-          pinId: "U1.2",
-          x: -1,
-          y: 0,
-        },
-        {
-          pinId: "U1.3",
-          x: -1,
-          y: -0.2,
-        },
-        {
-          pinId: "U1.4",
-          x: 1,
-          y: -0.1,
-        },
-        {
-          pinId: "U1.5",
-          x: 1,
-          y: 0.1,
-        },
-      ],
-    },
-  ],
-  directConnections: [
-    {
-      pinIds: ["U1.1", "C6.1"],
-      netId: "group.voltage_regulator > chip.U1 > port.VIN to C6.1",
-    },
-    {
-      pinIds: ["U1.1", "C1.1"],
-      netId: "group.voltage_regulator > chip.U1 > port.VIN to C1.1",
-    },
-    {
-      pinIds: ["U1.1", "C2.1"],
-      netId: "group.voltage_regulator > chip.U1 > port.VIN to C2.1",
-    },
-    {
-      pinIds: ["U1.2", "C6.2"],
-      netId: "group.voltage_regulator > chip.U1 > port.GND to C6.2",
-    },
-    {
-      pinIds: ["U1.2", "C1.2"],
-      netId: "group.voltage_regulator > chip.U1 > port.GND to C1.2",
-    },
-    {
-      pinIds: ["U1.2", "C2.2"],
-      netId: "group.voltage_regulator > chip.U1 > port.GND to C2.2",
-    },
-    {
-      pinIds: ["U1.3", "U1.1"],
-      netId: "group.voltage_regulator > chip.U1 > port.EN to U1.1",
-    },
-    {
-      pinIds: ["U1.5", "C5.1"],
-      netId: "group.voltage_regulator > chip.U1 > port.VOUT to C5.1",
-    },
-  ],
-  netConnections: [
-    {
-      netId: "VSYS",
-      pinIds: ["C6.1", "C1.1", "C2.1", "U1.1", "U1.3"],
-    },
-    {
-      netId: "GND",
-      pinIds: ["C6.2", "C1.2", "C2.2", "C5.2", "U1.2"],
-    },
-    {
-      netId: "V3_3",
-      pinIds: ["C5.1", "U1.5"],
-    },
-  ],
-  maxMspPairDistance: 2,
-  availableNetLabelOrientations: {
-    VSYS: ["y+"],
-    GND: ["y-"],
-    V3_3: ["y+"],
-  },
-}
+import inputProblem from "../../tests/assets/example02.json"
 
-export default () => <PipelineDebugger inputProblem={inputProblem} />
+export { inputProblem }
+
+export default () => <PipelineDebugger inputProblem={inputProblem as any} />

package/site/examples/example03.page.tsx

@@ -1,215 +1,6 @@
-import type { InputProblem } from "lib/index"
 import { PipelineDebugger } from "site/components/PipelineDebugger"
+import inputProblem from "../../tests/assets/example03.json"
 
-export const inputProblem: InputProblem = {
-  chips: [
-    {
-      chipId: "schematic_component_0",
-      center: {
-        x: -3,
-        y: 1.5,
-      },
-      width: 1.0011537820000012,
-      height: 0.44923699999999833,
-      pins: [
-        {
-          pinId: "PIN1_PIN2.1",
-          x: -3.4724184500000006,
-          y: 1.4489565000000004,
-        },
-        {
-          pinId: "PIN1_PIN2.2",
-          x: -3.4724184500000006,
-          y: 1.4489565000000004,
-        },
-        {
-          pinId: "PIN1_PIN2.3",
-          x: -2.5275815499999994,
-          y: 1.4485175000000003,
-        },
-        {
-          pinId: "PIN1_PIN2.4",
-          x: -2.5275815499999994,
-          y: 1.4485175000000003,
-        },
-      ],
-    },
-    {
-      chipId: "schematic_component_1",
-      center: {
-        x: 0,
-        y: 1.5,
-      },
-      width: 1.0011537820000012,
-      height: 0.44923699999999833,
-      pins: [
-        {
-          pinId: "PIN1_PIN3.1",
-          x: -0.4724184500000006,
-          y: 1.4489565000000004,
-        },
-        {
-          pinId: "PIN1_PIN3.2",
-          x: -0.4724184500000006,
-          y: 1.4489565000000004,
-        },
-        {
-          pinId: "PIN1_PIN3.3",
-          x: 0.4724184500000006,
-          y: 1.4485175000000003,
-        },
-        {
-          pinId: "PIN1_PIN3.4",
-          x: 0.4724184500000006,
-          y: 1.4485175000000003,
-        },
-      ],
-    },
-    {
-      chipId: "schematic_component_2",
-      center: {
-        x: 3,
-        y: 1.5,
-      },
-      width: 1.0011537820000012,
-      height: 0.44923699999999833,
-      pins: [
-        {
-          pinId: "PIN1_PIN4.1",
-          x: 2.5275815499999994,
-          y: 1.4489565000000004,
-        },
-        {
-          pinId: "PIN1_PIN4.2",
-          x: 2.5275815499999994,
-          y: 1.4489565000000004,
-        },
-        {
-          pinId: "PIN1_PIN4.3",
-          x: 3.4724184500000006,
-          y: 1.4485175000000003,
-        },
-        {
-          pinId: "PIN1_PIN4.4",
-          x: 3.4724184500000006,
-          y: 1.4485175000000003,
-        },
-      ],
-    },
-    {
-      chipId: "schematic_component_3",
-      center: {
-        x: -3,
-        y: -1.5,
-      },
-      width: 1.0011537820000012,
-      height: 0.44923699999999833,
-      pins: [
-        {
-          pinId: "PIN2_PIN3.1",
-          x: -3.4724184500000006,
-          y: -1.5510434999999996,
-        },
-        {
-          pinId: "PIN2_PIN3.2",
-          x: -3.4724184500000006,
-          y: -1.5510434999999996,
-        },
-        {
-          pinId: "PIN2_PIN3.3",
-          x: -2.5275815499999994,
-          y: -1.5514824999999997,
-        },
-        {
-          pinId: "PIN2_PIN3.4",
-          x: -2.5275815499999994,
-          y: -1.5514824999999997,
-        },
-      ],
-    },
-    {
-      chipId: "schematic_component_4",
-      center: {
-        x: 0,
-        y: -1.5,
-      },
-      width: 1.0011537820000012,
-      height: 0.44923699999999833,
-      pins: [
-        {
-          pinId: "PIN2_PIN4.1",
-          x: -0.4724184500000006,
-          y: -1.5510434999999996,
-        },
-        {
-          pinId: "PIN2_PIN4.2",
-          x: -0.4724184500000006,
-          y: -1.5510434999999996,
-        },
-        {
-          pinId: "PIN2_PIN4.3",
-          x: 0.4724184500000006,
-          y: -1.5514824999999997,
-        },
-        {
-          pinId: "PIN2_PIN4.4",
-          x: 0.4724184500000006,
-          y: -1.5514824999999997,
-        },
-      ],
-    },
-    {
-      chipId: "schematic_component_5",
-      center: {
-        x: 3,
-        y: -1.5,
-      },
-      width: 1.0011537820000012,
-      height: 0.44923699999999833,
-      pins: [
-        {
-          pinId: "PIN3_PIN4.1",
-          x: 2.5275815499999994,
-          y: -1.5510434999999996,
-        },
-        {
-          pinId: "PIN3_PIN4.2",
-          x: 2.5275815499999994,
-          y: -1.5510434999999996,
-        },
-        {
-          pinId: "PIN3_PIN4.3",
-          x: 3.4724184500000006,
-          y: -1.5514824999999997,
-        },
-        {
-          pinId: "PIN3_PIN4.4",
-          x: 3.4724184500000006,
-          y: -1.5514824999999997,
-        },
-      ],
-    },
-  ],
-  directConnections: [],
-  netConnections: [
-    {
-      netId: "PIN1",
-      pinIds: ["PIN1_PIN2.1", "PIN1_PIN3.1", "PIN1_PIN4.1"],
-    },
-    {
-      netId: "PIN2",
-      pinIds: ["PIN1_PIN2.2", "PIN2_PIN3.2", "PIN2_PIN4.2"],
-    },
-    {
-      netId: "PIN3",
-      pinIds: ["PIN1_PIN3.3", "PIN2_PIN3.3", "PIN3_PIN4.3"],
-    },
-    {
-      netId: "PIN4",
-      pinIds: ["PIN1_PIN4.4", "PIN2_PIN4.4", "PIN3_PIN4.4"],
-    },
-  ],
-  availableNetLabelOrientations: {},
-}
+export { inputProblem }
 
-export default () => <PipelineDebugger inputProblem={inputProblem} />
+export default () => <PipelineDebugger inputProblem={inputProblem as any} />

package/site/examples/example04.page.tsx

@@ -0,0 +1,6 @@
+import { PipelineDebugger } from "site/components/PipelineDebugger"
+import inputProblem from "../../tests/assets/example04.json"
+
+export { inputProblem }
+
+export default () => <PipelineDebugger inputProblem={inputProblem as any} />