From a5c76d06da859e3e18453f64bc0e13acef698ffd Mon Sep 17 00:00:00 2001 From: seveibar Date: Sun, 15 Sep 2024 15:10:05 -0700 Subject: [PATCH] update keyboard 7 --- .../tests/__snapshots__/multi-layer-keyboard7.snap.svg | 2 +- .../multi-layer-ijump/tests/multi-layer-keyboard7.test.tsx | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/algos/multi-layer-ijump/tests/__snapshots__/multi-layer-keyboard7.snap.svg b/algos/multi-layer-ijump/tests/__snapshots__/multi-layer-keyboard7.snap.svg index a1c6314..1b50055 100644 --- a/algos/multi-layer-ijump/tests/__snapshots__/multi-layer-keyboard7.snap.svg +++ b/algos/multi-layer-ijump/tests/__snapshots__/multi-layer-keyboard7.snap.svg @@ -9,4 +9,4 @@ .pcb-silkscreen-top { stroke: #f2eda1; } .pcb-silkscreen-bottom { stroke: #f2eda1; } .pcb-silkscreen-text { fill: #f2eda1; } - \ No newline at end of file + \ No newline at end of file diff --git a/algos/multi-layer-ijump/tests/multi-layer-keyboard7.test.tsx b/algos/multi-layer-ijump/tests/multi-layer-keyboard7.test.tsx index bfae84d..cd430d4 100644 --- a/algos/multi-layer-ijump/tests/multi-layer-keyboard7.test.tsx +++ b/algos/multi-layer-ijump/tests/multi-layer-keyboard7.test.tsx @@ -3,13 +3,17 @@ import { getKeyboardGenerator } from "autorouting-dataset/lib/generators/keyboar import { test, expect } from "bun:test" import { MultilayerIjump } from "../MultilayerIjump" import { circuitJsonToPcbSvg } from "circuit-to-svg" +import { getFullConnectivityMapFromCircuitJson } from "circuit-json-to-connectivity-map" test("multi-layer ijump keyboard", async () => { const soup = await getKeyboardGenerator().getExample({ seed: 7 }) - const input = getSimpleRouteJson(soup, { layerCount: 2 }) + const connMap = getFullConnectivityMapFromCircuitJson(soup) + const input = getSimpleRouteJson(soup, { layerCount: 2, connMap }) const autorouter = new MultilayerIjump({ input, + connMap, + optimizeWithGoalBoxes: true, }) const result = autorouter.solveAndMapToTraces()