Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,14 @@ export interface SchematicTracePipelineSolverParams {
allowLongDistanceTraces?: boolean
}

export interface PostProcessedTraceLine {
mspPairId: string
globalConnNetId: string
dcConnNetId: string
userNetId?: string
points: [{ x: number; y: number }, { x: number; y: number }]
}

export class SchematicTracePipelineSolver extends BaseSolver {
mspConnectionPairSolver?: MspConnectionPairSolver
// guidelinesSolver?: GuidelinesSolver
Expand Down Expand Up @@ -357,4 +365,56 @@ export class SchematicTracePipelineSolver extends BaseSolver {

return super.preview()
}

getPostProcessedTraceLines(): PostProcessedTraceLine[] {
const traces = this.getFinalTraces()
const dedupedLines: PostProcessedTraceLine[] = []
const seenSegments = new Set<string>()

for (const trace of traces) {
for (let i = 0; i < trace.tracePath.length - 1; i++) {
const p1 = trace.tracePath[i]!
const p2 = trace.tracePath[i + 1]!
const segmentKey = this.getNormalizedSegmentKey(p1, p2)
const key = `${trace.globalConnNetId}|${segmentKey}`
if (seenSegments.has(key)) continue

seenSegments.add(key)
dedupedLines.push({
mspPairId: trace.mspPairId,
globalConnNetId: trace.globalConnNetId,
dcConnNetId: trace.dcConnNetId,
userNetId: trace.userNetId,
points: [
{ x: p1.x, y: p1.y },
{ x: p2.x, y: p2.y },
],
})
}
}

return dedupedLines
}

private getFinalTraces(): SolvedTracePath[] {
if (this.traceCleanupSolver?.solved) {
return this.traceCleanupSolver.getOutput().traces
}
if (this.traceLabelOverlapAvoidanceSolver?.solved) {
return this.traceLabelOverlapAvoidanceSolver.getOutput().traces
}
if (this.traceOverlapShiftSolver?.solved) {
return Object.values(this.traceOverlapShiftSolver.correctedTraceMap)
}
return this.longDistancePairSolver?.getOutput().allTracesMerged ?? []
}

private getNormalizedSegmentKey(
p1: { x: number; y: number },
p2: { x: number; y: number },
): string {
const a = `${p1.x},${p1.y}`
const b = `${p2.x},${p2.y}`
return a < b ? `${a}|${b}` : `${b}|${a}`
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import { test, expect } from "bun:test"
import { SchematicTracePipelineSolver } from "lib/index"
import overlapFixture from "../../assets/OverlapAvoidanceStepSolver.test.input.json"

const segmentKey = (a: { x: number; y: number }, b: { x: number; y: number }) => {
const p1 = `${a.x},${a.y}`
const p2 = `${b.x},${b.y}`
return p1 < p2 ? `${p1}|${p2}` : `${p2}|${p1}`
}

test("SchematicTracePipelineSolver_repro78 removes extra trace lines in post-processing", () => {
const inputProblem = structuredClone((overlapFixture as any).problem)
// Hint from issue discussion: DISCH fixture reproduces when schMaxTraceDistance=6.
;(inputProblem as any).schMaxTraceDistance = 6

const solver = new SchematicTracePipelineSolver(inputProblem)
solver.solve()

const traces =
solver.traceCleanupSolver?.getOutput().traces ??
solver.traceLabelOverlapAvoidanceSolver?.getOutput().traces ??
[]

const rawSegmentCounts = new Map<string, number>()
for (const trace of traces as any[]) {
for (let i = 0; i < trace.tracePath.length - 1; i++) {
const key = `${trace.globalConnNetId}|${segmentKey(trace.tracePath[i], trace.tracePath[i + 1])}`
rawSegmentCounts.set(key, (rawSegmentCounts.get(key) ?? 0) + 1)
}
}

const duplicateRawSegments = [...rawSegmentCounts.entries()].filter(
([, count]) => count > 1,
)
expect(duplicateRawSegments.length).toBeGreaterThan(0)

const postProcessedLines = solver.getPostProcessedTraceLines()
const postProcessedKeys = new Set<string>()
for (const line of postProcessedLines) {
const key = `${line.globalConnNetId}|${segmentKey(line.points[0], line.points[1])}`
expect(postProcessedKeys.has(key)).toBeFalse()
postProcessedKeys.add(key)
}
})