diff --git a/lib/solvers/TraceCleanupSolver/minimizeTurnsWithFilteredLabels.ts b/lib / solvers / TraceCleanupSolver /minimizeTurnsWithFilteredLabels.ts similarity index 93% rename from lib/solvers/TraceCleanupSolver/minimizeTurnsWithFilteredLabels.ts rename to lib / solvers / TraceCleanupSolver /minimizeTurnsWithFilteredLabels.ts index 31616f03b..0c98daa0f 100644 --- a/lib/solvers/TraceCleanupSolver/minimizeTurnsWithFilteredLabels.ts +++ b/lib / solvers / TraceCleanupSolver /minimizeTurnsWithFilteredLabels.ts @@ -51,9 +51,10 @@ export const minimizeTurnsWithFilteredLabels = ({ const TRACE_WIDTH = 0.01 const getTraceObstacles = (obstacleTraces: SolvedTracePath[]) => - obstacleTraces.flatMap((trace, i) => - trace.tracePath.slice(0, -1).map((p1, pi) => { - const p2 = trace.tracePath[pi + 1]! + obstacleTraces.flatMap((trace, i) => { + const tracePath = (trace as any).tracePath ?? (trace as any).path + return tracePath.slice(0, -1).map((p1: any, pi: number) => { + const p2 = tracePath[pi + 1]! return { chipId: `trace-obstacle-${i}-${pi}`, minX: Math.min(p1.x, p2.x) - TRACE_WIDTH / 2, @@ -61,8 +62,8 @@ export const minimizeTurnsWithFilteredLabels = ({ maxX: Math.max(p1.x, p2.x) + TRACE_WIDTH / 2, maxY: Math.max(p1.y, p2.y) + TRACE_WIDTH / 2, } - }), - ) + }) + }) const staticObstaclesRaw = getObstacleRects(inputProblem) const PADDING = 0.01 @@ -74,7 +75,8 @@ export const minimizeTurnsWithFilteredLabels = ({ maxY: obs.maxY + PADDING, })) - const originalPath = targetTrace.tracePath + const originalPath = + (targetTrace as any).tracePath ?? (targetTrace as any).path const filteredLabels = allLabelPlacements.filter((label) => { const originalNetIds = mergedLabelNetIdMap[label.globalConnNetId] if (originalNetIds) {