fix pointsToConnect not properly updating with preprocess step results

tscircuit · Sep 15, 2024 · 74c2ce7 · 74c2ce7
1 parent a61afd4
commit 74c2ce7
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 4 deletions.
diff --git a/algos/infinite-grid-ijump-astar/v2/lib/GeneralizedAstar.ts b/algos/infinite-grid-ijump-astar/v2/lib/GeneralizedAstar.ts
@@ -220,14 +220,15 @@ export class GeneralizedAstarAutorouter {
   }
 
   solveConnection(connection: SimpleRouteConnection): ConnectionSolveResult {
-    const { pointsToConnect } = connection
-    if (pointsToConnect.length > 2) {
+    if (connection.pointsToConnect.length > 2) {
       throw new Error(
         "GeneralizedAstarAutorouter doesn't currently support 2+ points in a connection",
       )
     }
     connection = this.preprocessConnectionBeforeSolving(connection)
 
+    const { pointsToConnect } = connection
+
     this.iterations = 0
     this.closedSet = new Set()
     this.startNode = this.getStartNode(connection)

diff --git a/algos/multi-layer-ijump/MultilayerIjump.ts b/algos/multi-layer-ijump/MultilayerIjump.ts
@@ -41,7 +41,7 @@ import {
 } from "autorouting-dataset/lib/solver-utils/getAlternativeGoalBoxes"
 
 export class MultilayerIjump extends GeneralizedAstarAutorouter {
-  MAX_ITERATIONS: number = 200
+  MAX_ITERATIONS: number = 500
   VIA_COST: number = 4 // Define the cost for changing layers
   VIA_DIAMETER: number = 0.5
   allowLayerChange: boolean = true // Flag to allow layer changes

diff --git a/algos/multi-layer-ijump/benchmark.ts b/algos/multi-layer-ijump/benchmark.ts
@@ -5,4 +5,5 @@ await runBenchmark({
   solver: autoroute,
   solverName: "multi-layer-ijump",
   verbose: true,
+  problemType: "keyboards",
 })
diff --git a/algos/multi-layer-ijump/index.ts b/algos/multi-layer-ijump/index.ts
@@ -15,6 +15,8 @@ export function autoroute(soup: AnySoupElement[]): SolutionWithDebugInfo {
   const autorouter = new MultilayerIjump({
     input,
     connMap,
+    // isRemovePathLoopsEnabled: true,
+    optimizeWithGoalBoxes: true,
   })
 
   const solution = autorouter.solveAndMapToTraces()

diff --git a/algos/multi-layer-ijump/tests/__snapshots__/multi-layer-keyboard2.snap.svg b/algos/multi-layer-ijump/tests/__snapshots__/multi-layer-keyboard2.snap.svg
diff --git a/...ump/tests/__snapshots__/keyboard.snap.svg → ...napshots__/multi-layer-keyboard7.snap.svg b/...ump/tests/__snapshots__/keyboard.snap.svg → ...napshots__/multi-layer-keyboard7.snap.svg