Skip to content

refactor(pipeline): Decompose overlap solver #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor(pipeline): Decompose overlap solver #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 31 additions & 18 deletions lib/solvers/SchematicTracePipelineSolver/SchematicTracePipelineSolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,19 @@ import type { GraphicsObject } from "graphics-debug"
import { BaseSolver } from "lib/solvers/BaseSolver/BaseSolver"
import type { InputProblem } from "lib/types/InputProblem"
import { MspConnectionPairSolver } from "../MspConnectionPairSolver/MspConnectionPairSolver"
import { SchematicTraceLinesSolver } from "../SchematicTraceLinesSolver/SchematicTraceLinesSolver"
import {
SchematicTraceLinesSolver,
type SolvedTracePath,
} from "../SchematicTraceLinesSolver/SchematicTraceLinesSolver"
import { TraceOverlapShiftSolver } from "../TraceOverlapShiftSolver/TraceOverlapShiftSolver"
import { NetLabelPlacementSolver } from "../NetLabelPlacementSolver/NetLabelPlacementSolver"
import { visualizeInputProblem } from "./visualizeInputProblem"
import { GuidelinesSolver } from "../GuidelinesSolver/GuidelinesSolver"
import { TraceLabelOverlapAvoidanceSolver } from "../TraceLabelOverlapAvoidanceSolver/TraceLabelOverlapAvoidanceSolver"
import { getInputChipBounds } from "../GuidelinesSolver/getInputChipBounds"
import { correctPinsInsideChips } from "./correctPinsInsideChip"
import { expandChipsToFitPins } from "./expandChipsToFitPins"
import { LongDistancePairSolver } from "../LongDistancePairSolver/LongDistancePairSolver"
import { MergedNetLabelObstacles } from "../TraceLabelOverlapAvoidanceSolver/sub-solvers/LabelMergingSolver/LabelMergingSolver"
import { TraceCleanupSolver } from "../TraceLabelOverlapAvoidanceSolver/sub-solvers/TraceCleanupSolver/TraceCleanupSolver"

type PipelineStep<T extends new (...args: any[]) => BaseSolver> = {
solverName: string
Expand Down Expand Up @@ -63,7 +66,9 @@ export class SchematicTracePipelineSolver extends BaseSolver {
longDistancePairSolver?: LongDistancePairSolver
traceOverlapShiftSolver?: TraceOverlapShiftSolver
netLabelPlacementSolver?: NetLabelPlacementSolver
labelMergingSolver?: MergedNetLabelObstacles
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
labelMergingSolver?: MergedNetLabelObstacles
labelMergingSolver?: MergedNetLabelObstacleSolver

traceLabelOverlapAvoidanceSolver?: TraceLabelOverlapAvoidanceSolver
traceCleanupSolver?: TraceCleanupSolver

startTimeOfPhase: Record<string, number>
endTimeOfPhase: Record<string, number>
Expand Down Expand Up @@ -176,24 +181,29 @@ export class SchematicTracePipelineSolver extends BaseSolver {

return [
{
inputProblem: instance.inputProblem,
problem: instance.inputProblem,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
problem: instance.inputProblem,
inputProblem: instance.inputProblem,

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

one of our principles is variable transparency https://github.com/tscircuit/handbook/blob/main/guides/code.md

traces,
netLabelPlacements,
},
]
},
{
onSolved: (instance) => {
if (
instance.traceLabelOverlapAvoidanceSolver &&
instance.netLabelPlacementSolver
) {
const { netLabelPlacements } =
instance.traceLabelOverlapAvoidanceSolver.getOutput()
instance.netLabelPlacementSolver.netLabelPlacements =
netLabelPlacements
}
},
),
definePipelineStep(
"netLabelPlacementSolver",
NetLabelPlacementSolver,
(instance) => {
const traces =
instance.traceCleanupSolver?.getOutput().traces ??
instance.traceLabelOverlapAvoidanceSolver!.getOutput().traces

return [
{
inputProblem: instance.inputProblem,
inputTraceMap: Object.fromEntries(
traces.map((trace: SolvedTracePath) => [trace.mspPairId, trace]),
),
},
]
},
),
]
Expand Down Expand Up @@ -303,16 +313,19 @@ export class SchematicTracePipelineSolver extends BaseSolver {
}) as GraphicsObject[]),
]

if (visualizations.length === 1) return visualizations[0]!
if (visualizations.length === 1) {
return visualizations[0]!
}

// Simple combination of visualizations
return {
const finalGraphics = {
points: visualizations.flatMap((v) => v.points || []),
rects: visualizations.flatMap((v) => v.rects || []),
lines: visualizations.flatMap((v) => v.lines || []),
circles: visualizations.flatMap((v) => v.circles || []),
texts: visualizations.flatMap((v) => v.texts || []),
}
return finalGraphics
}

/**
Expand Down
Loading