@tscircuit/schematic-trace-solver 0.0.50 → 0.0.51
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.ts +56 -1
- package/dist/index.js +362 -40
- package/lib/solvers/SchematicTracePipelineSolver/SchematicTracePipelineSolver.ts +16 -0
- package/lib/solvers/VccNetLabelCornerPlacementSolver/VccNetLabelCornerPlacementSolver.ts +268 -0
- package/lib/solvers/VccNetLabelCornerPlacementSolver/geometry.ts +59 -0
- package/lib/solvers/VccNetLabelCornerPlacementSolver/types.ts +37 -0
- package/lib/solvers/VccNetLabelCornerPlacementSolver/visualize.ts +114 -0
- package/package.json +1 -1
- package/tests/examples/__snapshots__/example12.snap.svg +2 -2
- package/tests/examples/__snapshots__/example14.snap.svg +68 -68
- package/tests/examples/__snapshots__/example31.snap.svg +12 -12
package/dist/index.d.ts
CHANGED
|
@@ -706,6 +706,60 @@ declare class AvailableNetOrientationSolver extends BaseSolver {
|
|
|
706
706
|
visualize(): GraphicsObject;
|
|
707
707
|
}
|
|
708
708
|
|
|
709
|
+
interface VccNetLabelCornerPlacementSolverParams {
|
|
710
|
+
inputProblem: InputProblem;
|
|
711
|
+
traces: SolvedTracePath[];
|
|
712
|
+
netLabelPlacements: NetLabelPlacement[];
|
|
713
|
+
}
|
|
714
|
+
type TraceCornerCandidate = {
|
|
715
|
+
anchorPoint: Point;
|
|
716
|
+
traceId: string;
|
|
717
|
+
distance: number;
|
|
718
|
+
};
|
|
719
|
+
type CornerCandidateStatus = "valid" | "chip-collision" | "trace-collision" | "netlabel-collision";
|
|
720
|
+
type EvaluatedCornerCandidate = TraceCornerCandidate & {
|
|
721
|
+
center: Point;
|
|
722
|
+
width: number;
|
|
723
|
+
height: number;
|
|
724
|
+
status: CornerCandidateStatus;
|
|
725
|
+
selected: boolean;
|
|
726
|
+
};
|
|
727
|
+
|
|
728
|
+
declare class VccNetLabelCornerPlacementSolver extends BaseSolver {
|
|
729
|
+
inputProblem: InputProblem;
|
|
730
|
+
traces: SolvedTracePath[];
|
|
731
|
+
netLabelPlacements: NetLabelPlacement[];
|
|
732
|
+
outputNetLabelPlacements: NetLabelPlacement[];
|
|
733
|
+
queuedLabelIndices: number[];
|
|
734
|
+
currentLabelIndex: number | null;
|
|
735
|
+
currentLabel: NetLabelPlacement | null;
|
|
736
|
+
currentCandidateResults: EvaluatedCornerCandidate[];
|
|
737
|
+
private queuedCornerCandidates;
|
|
738
|
+
private shouldAdvanceToNextLabel;
|
|
739
|
+
private traceMap;
|
|
740
|
+
constructor(params: VccNetLabelCornerPlacementSolverParams);
|
|
741
|
+
getConstructorParams(): ConstructorParameters<typeof VccNetLabelCornerPlacementSolver>[0];
|
|
742
|
+
_step(): void;
|
|
743
|
+
getOutput(): {
|
|
744
|
+
netLabelPlacements: NetLabelPlacement[];
|
|
745
|
+
};
|
|
746
|
+
private getProcessableLabelIndices;
|
|
747
|
+
private prepareNextLabel;
|
|
748
|
+
private advanceToNextLabel;
|
|
749
|
+
private clearCurrentLabel;
|
|
750
|
+
private finish;
|
|
751
|
+
private evaluateCornerCandidate;
|
|
752
|
+
private getCandidateStatus;
|
|
753
|
+
private applyCandidate;
|
|
754
|
+
private shouldProcessLabel;
|
|
755
|
+
private intersectsAnyChip;
|
|
756
|
+
private intersectsAnyOtherNetLabel;
|
|
757
|
+
private getCornerCandidatesForLabel;
|
|
758
|
+
private getTraceLinesForLabel;
|
|
759
|
+
private isTraceForLabel;
|
|
760
|
+
visualize(): GraphicsObject;
|
|
761
|
+
}
|
|
762
|
+
|
|
709
763
|
/**
|
|
710
764
|
* Pipeline solver that runs a series of solvers to find the best schematic layout.
|
|
711
765
|
* Coordinates the entire layout process from chip partitioning through final packing.
|
|
@@ -733,12 +787,13 @@ declare class SchematicTracePipelineSolver extends BaseSolver {
|
|
|
733
787
|
traceCleanupSolver?: TraceCleanupSolver;
|
|
734
788
|
example28Solver?: Example28Solver;
|
|
735
789
|
availableNetOrientationSolver?: AvailableNetOrientationSolver;
|
|
790
|
+
vccNetLabelCornerPlacementSolver?: VccNetLabelCornerPlacementSolver;
|
|
736
791
|
startTimeOfPhase: Record<string, number>;
|
|
737
792
|
endTimeOfPhase: Record<string, number>;
|
|
738
793
|
timeSpentOnPhase: Record<string, number>;
|
|
739
794
|
firstIterationOfPhase: Record<string, number>;
|
|
740
795
|
inputProblem: InputProblem;
|
|
741
|
-
pipelineDef: (PipelineStep<typeof MspConnectionPairSolver> | PipelineStep<typeof SchematicTraceLinesSolver> | PipelineStep<typeof LongDistancePairSolver> | PipelineStep<typeof TraceOverlapShiftSolver> | PipelineStep<typeof NetLabelPlacementSolver> | PipelineStep<typeof TraceLabelOverlapAvoidanceSolver> | PipelineStep<typeof TraceCleanupSolver> | PipelineStep<typeof Example28Solver> | PipelineStep<typeof AvailableNetOrientationSolver>)[];
|
|
796
|
+
pipelineDef: (PipelineStep<typeof MspConnectionPairSolver> | PipelineStep<typeof SchematicTraceLinesSolver> | PipelineStep<typeof LongDistancePairSolver> | PipelineStep<typeof TraceOverlapShiftSolver> | PipelineStep<typeof NetLabelPlacementSolver> | PipelineStep<typeof TraceLabelOverlapAvoidanceSolver> | PipelineStep<typeof TraceCleanupSolver> | PipelineStep<typeof Example28Solver> | PipelineStep<typeof AvailableNetOrientationSolver> | PipelineStep<typeof VccNetLabelCornerPlacementSolver>)[];
|
|
742
797
|
constructor(inputProblem: InputProblem);
|
|
743
798
|
getConstructorParams(): ConstructorParameters<typeof SchematicTracePipelineSolver>[0];
|
|
744
799
|
currentPipelineStepIndex: number;
|
package/dist/index.js
CHANGED
|
@@ -271,19 +271,19 @@ var doesPairCrossRestrictedCenterLines = (params) => {
|
|
|
271
271
|
chipMap
|
|
272
272
|
});
|
|
273
273
|
if (restrictedCenterLines.size === 0) return false;
|
|
274
|
-
const
|
|
274
|
+
const EPS8 = 1e-9;
|
|
275
275
|
const crossesSegment = (a, b) => {
|
|
276
276
|
for (const [, rcl] of restrictedCenterLines) {
|
|
277
277
|
if (rcl.axes.has("x") && typeof rcl.x === "number") {
|
|
278
|
-
if ((a.x - rcl.x) * (b.x - rcl.x) < -
|
|
278
|
+
if ((a.x - rcl.x) * (b.x - rcl.x) < -EPS8) return true;
|
|
279
279
|
}
|
|
280
280
|
if (rcl.axes.has("y") && typeof rcl.y === "number") {
|
|
281
|
-
if ((a.y - rcl.y) * (b.y - rcl.y) < -
|
|
281
|
+
if ((a.y - rcl.y) * (b.y - rcl.y) < -EPS8) return true;
|
|
282
282
|
}
|
|
283
283
|
}
|
|
284
284
|
return false;
|
|
285
285
|
};
|
|
286
|
-
if (Math.abs(p1.x - p2.x) <
|
|
286
|
+
if (Math.abs(p1.x - p2.x) < EPS8 || Math.abs(p1.y - p2.y) < EPS8) {
|
|
287
287
|
return crossesSegment({ x: p1.x, y: p1.y }, { x: p2.x, y: p2.y });
|
|
288
288
|
}
|
|
289
289
|
const elbowHV = { x: p2.x, y: p1.y };
|
|
@@ -810,8 +810,8 @@ var SchematicTraceSingleLineSolver2 = class extends BaseSolver {
|
|
|
810
810
|
if (!collision) {
|
|
811
811
|
const first = path[0];
|
|
812
812
|
const last = path[path.length - 1];
|
|
813
|
-
const
|
|
814
|
-
const samePoint = (p, q) => Math.abs(p.x - q.x) <
|
|
813
|
+
const EPS8 = 1e-9;
|
|
814
|
+
const samePoint = (p, q) => Math.abs(p.x - q.x) < EPS8 && Math.abs(p.y - q.y) < EPS8;
|
|
815
815
|
if (samePoint(first, { x: PA.x, y: PA.y }) && samePoint(last, { x: PB.x, y: PB.y })) {
|
|
816
816
|
this.solvedTracePath = path;
|
|
817
817
|
this.solved = true;
|
|
@@ -1010,13 +1010,13 @@ var applyJogToTerminalSegment = ({
|
|
|
1010
1010
|
segmentIndex: si,
|
|
1011
1011
|
offset,
|
|
1012
1012
|
JOG_SIZE,
|
|
1013
|
-
EPS:
|
|
1013
|
+
EPS: EPS8 = 1e-6
|
|
1014
1014
|
}) => {
|
|
1015
1015
|
if (si !== 0 && si !== pts.length - 2) return;
|
|
1016
1016
|
const start = pts[si];
|
|
1017
1017
|
const end = pts[si + 1];
|
|
1018
|
-
const isVertical3 = Math.abs(start.x - end.x) <
|
|
1019
|
-
const isHorizontal2 = Math.abs(start.y - end.y) <
|
|
1018
|
+
const isVertical3 = Math.abs(start.x - end.x) < EPS8;
|
|
1019
|
+
const isHorizontal2 = Math.abs(start.y - end.y) < EPS8;
|
|
1020
1020
|
if (!isVertical3 && !isHorizontal2) return;
|
|
1021
1021
|
const segDir = isVertical3 ? end.y > start.y ? 1 : -1 : end.x > start.x ? 1 : -1;
|
|
1022
1022
|
if (si === 0) {
|
|
@@ -1083,13 +1083,13 @@ var TraceOverlapIssueSolver = class extends BaseSolver {
|
|
|
1083
1083
|
}
|
|
1084
1084
|
}
|
|
1085
1085
|
_step() {
|
|
1086
|
-
const
|
|
1086
|
+
const EPS8 = 1e-6;
|
|
1087
1087
|
const offsets = this.overlappingTraceSegments.map((_, idx) => {
|
|
1088
1088
|
const n = Math.floor(idx / 2) + 1;
|
|
1089
1089
|
const signed = idx % 2 === 0 ? -n : n;
|
|
1090
1090
|
return signed * this.SHIFT_DISTANCE;
|
|
1091
1091
|
});
|
|
1092
|
-
const eq = (a, b) => Math.abs(a - b) <
|
|
1092
|
+
const eq = (a, b) => Math.abs(a - b) < EPS8;
|
|
1093
1093
|
const samePoint = (p, q) => !!p && !!q && eq(p.x, q.x) && eq(p.y, q.y);
|
|
1094
1094
|
this.overlappingTraceSegments.forEach((group, gidx) => {
|
|
1095
1095
|
const offset = offsets[gidx];
|
|
@@ -1115,13 +1115,13 @@ var TraceOverlapIssueSolver = class extends BaseSolver {
|
|
|
1115
1115
|
segmentIndex: si,
|
|
1116
1116
|
offset,
|
|
1117
1117
|
JOG_SIZE,
|
|
1118
|
-
EPS:
|
|
1118
|
+
EPS: EPS8
|
|
1119
1119
|
});
|
|
1120
1120
|
} else {
|
|
1121
1121
|
const start = pts[si];
|
|
1122
1122
|
const end = pts[si + 1];
|
|
1123
|
-
const isVertical3 = Math.abs(start.x - end.x) <
|
|
1124
|
-
const isHorizontal2 = Math.abs(start.y - end.y) <
|
|
1123
|
+
const isVertical3 = Math.abs(start.x - end.x) < EPS8;
|
|
1124
|
+
const isHorizontal2 = Math.abs(start.y - end.y) < EPS8;
|
|
1125
1125
|
if (!isVertical3 && !isHorizontal2) continue;
|
|
1126
1126
|
if (isVertical3) {
|
|
1127
1127
|
start.x += offset;
|
|
@@ -1218,7 +1218,7 @@ var TraceOverlapShiftSolver = class extends BaseSolver {
|
|
|
1218
1218
|
return islands;
|
|
1219
1219
|
}
|
|
1220
1220
|
findNextOverlapIssue() {
|
|
1221
|
-
const
|
|
1221
|
+
const EPS8 = 2e-3;
|
|
1222
1222
|
const netIds = Object.keys(this.traceNetIslands);
|
|
1223
1223
|
for (let i = 0; i < netIds.length; i++) {
|
|
1224
1224
|
for (let j = i + 1; j < netIds.length; j++) {
|
|
@@ -1236,7 +1236,7 @@ var TraceOverlapShiftSolver = class extends BaseSolver {
|
|
|
1236
1236
|
const minB = Math.min(b1, b2);
|
|
1237
1237
|
const maxB = Math.max(b1, b2);
|
|
1238
1238
|
const overlap = Math.min(maxA, maxB) - Math.max(minA, minB);
|
|
1239
|
-
return overlap >
|
|
1239
|
+
return overlap > EPS8;
|
|
1240
1240
|
};
|
|
1241
1241
|
for (let pa = 0; pa < pathsA.length; pa++) {
|
|
1242
1242
|
const pathA = pathsA[pa];
|
|
@@ -1244,8 +1244,8 @@ var TraceOverlapShiftSolver = class extends BaseSolver {
|
|
|
1244
1244
|
for (let sa = 0; sa < ptsA.length - 1; sa++) {
|
|
1245
1245
|
const a1 = ptsA[sa];
|
|
1246
1246
|
const a2 = ptsA[sa + 1];
|
|
1247
|
-
const aVert = Math.abs(a1.x - a2.x) <
|
|
1248
|
-
const aHorz = Math.abs(a1.y - a2.y) <
|
|
1247
|
+
const aVert = Math.abs(a1.x - a2.x) < EPS8;
|
|
1248
|
+
const aHorz = Math.abs(a1.y - a2.y) < EPS8;
|
|
1249
1249
|
if (!aVert && !aHorz) continue;
|
|
1250
1250
|
for (let pb = 0; pb < pathsB.length; pb++) {
|
|
1251
1251
|
const pathB = pathsB[pb];
|
|
@@ -1253,11 +1253,11 @@ var TraceOverlapShiftSolver = class extends BaseSolver {
|
|
|
1253
1253
|
for (let sb = 0; sb < ptsB.length - 1; sb++) {
|
|
1254
1254
|
const b1 = ptsB[sb];
|
|
1255
1255
|
const b2 = ptsB[sb + 1];
|
|
1256
|
-
const bVert = Math.abs(b1.x - b2.x) <
|
|
1257
|
-
const bHorz = Math.abs(b1.y - b2.y) <
|
|
1256
|
+
const bVert = Math.abs(b1.x - b2.x) < EPS8;
|
|
1257
|
+
const bHorz = Math.abs(b1.y - b2.y) < EPS8;
|
|
1258
1258
|
if (!bVert && !bHorz) continue;
|
|
1259
1259
|
if (aVert && bVert) {
|
|
1260
|
-
if (Math.abs(a1.x - b1.x) <
|
|
1260
|
+
if (Math.abs(a1.x - b1.x) < EPS8) {
|
|
1261
1261
|
if (overlaps1D(a1.y, a2.y, b1.y, b2.y)) {
|
|
1262
1262
|
const keyA = `${pa}:${sa}`;
|
|
1263
1263
|
const keyB = `${pb}:${sb}`;
|
|
@@ -1278,7 +1278,7 @@ var TraceOverlapShiftSolver = class extends BaseSolver {
|
|
|
1278
1278
|
}
|
|
1279
1279
|
}
|
|
1280
1280
|
} else if (aHorz && bHorz) {
|
|
1281
|
-
if (Math.abs(a1.y - b1.y) <
|
|
1281
|
+
if (Math.abs(a1.y - b1.y) < EPS8) {
|
|
1282
1282
|
if (overlaps1D(a1.x, a2.x, b1.x, b2.x)) {
|
|
1283
1283
|
const keyA = `${pa}:${sa}`;
|
|
1284
1284
|
const keyB = `${pb}:${sb}`;
|
|
@@ -1316,14 +1316,14 @@ var TraceOverlapShiftSolver = class extends BaseSolver {
|
|
|
1316
1316
|
return null;
|
|
1317
1317
|
}
|
|
1318
1318
|
findNextDiagonalSegment() {
|
|
1319
|
-
const
|
|
1319
|
+
const EPS8 = 2e-3;
|
|
1320
1320
|
for (const mspPairId in this.correctedTraceMap) {
|
|
1321
1321
|
const tracePath = this.correctedTraceMap[mspPairId].tracePath;
|
|
1322
1322
|
for (let i = 0; i < tracePath.length - 1; i++) {
|
|
1323
1323
|
const p1 = tracePath[i];
|
|
1324
1324
|
const p2 = tracePath[i + 1];
|
|
1325
|
-
const isHorizontal2 = Math.abs(p1.y - p2.y) <
|
|
1326
|
-
const isVertical3 = Math.abs(p1.x - p2.x) <
|
|
1325
|
+
const isHorizontal2 = Math.abs(p1.y - p2.y) < EPS8;
|
|
1326
|
+
const isVertical3 = Math.abs(p1.x - p2.x) < EPS8;
|
|
1327
1327
|
if (!isHorizontal2 && !isVertical3) {
|
|
1328
1328
|
return { mspPairId, tracePath, i, p1, p2 };
|
|
1329
1329
|
}
|
|
@@ -1337,13 +1337,13 @@ var TraceOverlapShiftSolver = class extends BaseSolver {
|
|
|
1337
1337
|
return false;
|
|
1338
1338
|
}
|
|
1339
1339
|
const { mspPairId, tracePath, i, p1, p2 } = diagonalInfo;
|
|
1340
|
-
const
|
|
1340
|
+
const EPS8 = 2e-3;
|
|
1341
1341
|
const p0 = i > 0 ? tracePath[i - 1] : null;
|
|
1342
1342
|
const p3 = i + 2 < tracePath.length ? tracePath[i + 2] : null;
|
|
1343
|
-
const prevIsVertical = p0 ? Math.abs(p0.x - p1.x) <
|
|
1344
|
-
const prevIsHorizontal = p0 ? Math.abs(p0.y - p1.y) <
|
|
1345
|
-
const nextIsVertical = p3 ? Math.abs(p2.x - p3.x) <
|
|
1346
|
-
const nextIsHorizontal = p3 ? Math.abs(p2.y - p3.y) <
|
|
1343
|
+
const prevIsVertical = p0 ? Math.abs(p0.x - p1.x) < EPS8 : false;
|
|
1344
|
+
const prevIsHorizontal = p0 ? Math.abs(p0.y - p1.y) < EPS8 : false;
|
|
1345
|
+
const nextIsVertical = p3 ? Math.abs(p2.x - p3.x) < EPS8 : false;
|
|
1346
|
+
const nextIsHorizontal = p3 ? Math.abs(p2.y - p3.y) < EPS8 : false;
|
|
1347
1347
|
const elbow1 = { x: p1.x, y: p2.y };
|
|
1348
1348
|
const elbow2 = { x: p2.x, y: p1.y };
|
|
1349
1349
|
let score1 = 0;
|
|
@@ -1507,24 +1507,24 @@ function getRectBounds(center, w, h) {
|
|
|
1507
1507
|
}
|
|
1508
1508
|
|
|
1509
1509
|
// lib/solvers/NetLabelPlacementSolver/SingleNetLabelPlacementSolver/collisions.ts
|
|
1510
|
-
function segmentIntersectsRect2(p1, p2, rect,
|
|
1511
|
-
const isVert = Math.abs(p1.x - p2.x) <
|
|
1512
|
-
const isHorz = Math.abs(p1.y - p2.y) <
|
|
1510
|
+
function segmentIntersectsRect2(p1, p2, rect, EPS8 = 1e-9) {
|
|
1511
|
+
const isVert = Math.abs(p1.x - p2.x) < EPS8;
|
|
1512
|
+
const isHorz = Math.abs(p1.y - p2.y) < EPS8;
|
|
1513
1513
|
if (!isVert && !isHorz) return false;
|
|
1514
1514
|
if (isVert) {
|
|
1515
1515
|
const x = p1.x;
|
|
1516
|
-
if (x < rect.minX -
|
|
1516
|
+
if (x < rect.minX - EPS8 || x > rect.maxX + EPS8) return false;
|
|
1517
1517
|
const segMinY = Math.min(p1.y, p2.y);
|
|
1518
1518
|
const segMaxY = Math.max(p1.y, p2.y);
|
|
1519
1519
|
const overlap = Math.min(segMaxY, rect.maxY) - Math.max(segMinY, rect.minY);
|
|
1520
|
-
return overlap >
|
|
1520
|
+
return overlap > EPS8;
|
|
1521
1521
|
} else {
|
|
1522
1522
|
const y = p1.y;
|
|
1523
|
-
if (y < rect.minY -
|
|
1523
|
+
if (y < rect.minY - EPS8 || y > rect.maxY + EPS8) return false;
|
|
1524
1524
|
const segMinX = Math.min(p1.x, p2.x);
|
|
1525
1525
|
const segMaxX = Math.max(p1.x, p2.x);
|
|
1526
1526
|
const overlap = Math.min(segMaxX, rect.maxX) - Math.max(segMinX, rect.minX);
|
|
1527
|
-
return overlap >
|
|
1527
|
+
return overlap > EPS8;
|
|
1528
1528
|
}
|
|
1529
1529
|
}
|
|
1530
1530
|
function rectIntersectsAnyTrace(bounds, inputTraceMap, hostPathId, hostSegIndex) {
|
|
@@ -1902,14 +1902,14 @@ var SingleNetLabelPlacementSolver = class extends BaseSolver {
|
|
|
1902
1902
|
};
|
|
1903
1903
|
let bestCandidate = null;
|
|
1904
1904
|
let bestScore = -Infinity;
|
|
1905
|
-
const
|
|
1905
|
+
const EPS8 = 1e-6;
|
|
1906
1906
|
for (const curr of tracesToScan) {
|
|
1907
1907
|
const pts = curr.tracePath.slice();
|
|
1908
1908
|
for (let si = 0; si < pts.length - 1; si++) {
|
|
1909
1909
|
const a = pts[si];
|
|
1910
1910
|
const b = pts[si + 1];
|
|
1911
|
-
const isH = Math.abs(a.y - b.y) <
|
|
1912
|
-
const isV = Math.abs(a.x - b.x) <
|
|
1911
|
+
const isH = Math.abs(a.y - b.y) < EPS8;
|
|
1912
|
+
const isV = Math.abs(a.x - b.x) < EPS8;
|
|
1913
1913
|
if (!isH && !isV) continue;
|
|
1914
1914
|
const segmentAllowed = isH ? ["y+", "y-"] : ["x+", "x-"];
|
|
1915
1915
|
const candidateOrients = orientations.filter(
|
|
@@ -6054,6 +6054,314 @@ var AvailableNetOrientationSolver = class extends BaseSolver {
|
|
|
6054
6054
|
}
|
|
6055
6055
|
};
|
|
6056
6056
|
|
|
6057
|
+
// lib/solvers/VccNetLabelCornerPlacementSolver/geometry.ts
|
|
6058
|
+
var EPS7 = 1e-6;
|
|
6059
|
+
var isTraceLine = (trace) => getUniquePinCount(trace.pinIds) >= 2;
|
|
6060
|
+
var rectsOverlap2 = (a, b) => Math.min(a.maxX, b.maxX) - Math.max(a.minX, b.minX) > EPS7 && Math.min(a.maxY, b.maxY) - Math.max(a.minY, b.minY) > EPS7;
|
|
6061
|
+
var getTraceCorners = (path) => {
|
|
6062
|
+
const corners = [];
|
|
6063
|
+
for (let i = 1; i < path.length - 1; i++) {
|
|
6064
|
+
const previousPoint = path[i - 1];
|
|
6065
|
+
const cornerPoint = path[i];
|
|
6066
|
+
const nextPoint = path[i + 1];
|
|
6067
|
+
if (isTraceCorner(previousPoint, cornerPoint, nextPoint)) {
|
|
6068
|
+
corners.push(cornerPoint);
|
|
6069
|
+
}
|
|
6070
|
+
}
|
|
6071
|
+
return corners;
|
|
6072
|
+
};
|
|
6073
|
+
var tracePathContainsPoint = (path, point) => {
|
|
6074
|
+
for (let i = 0; i < path.length - 1; i++) {
|
|
6075
|
+
if (isPointOnSegment(point, path[i], path[i + 1])) return true;
|
|
6076
|
+
}
|
|
6077
|
+
return false;
|
|
6078
|
+
};
|
|
6079
|
+
var getDistance2 = (a, b) => Math.abs(a.x - b.x) + Math.abs(a.y - b.y);
|
|
6080
|
+
var getUniquePinCount = (pinIds) => new Set(pinIds).size;
|
|
6081
|
+
var isTraceCorner = (a, b, c) => getSegmentOrientation2(a, b) !== getSegmentOrientation2(b, c);
|
|
6082
|
+
var isPointOnSegment = (point, start, end) => {
|
|
6083
|
+
if (getSegmentOrientation2(start, end) === "horizontal") {
|
|
6084
|
+
return Math.abs(point.y - start.y) <= EPS7 && point.x >= Math.min(start.x, end.x) - EPS7 && point.x <= Math.max(start.x, end.x) + EPS7;
|
|
6085
|
+
}
|
|
6086
|
+
return Math.abs(point.x - start.x) <= EPS7 && point.y >= Math.min(start.y, end.y) - EPS7 && point.y <= Math.max(start.y, end.y) + EPS7;
|
|
6087
|
+
};
|
|
6088
|
+
var getSegmentOrientation2 = (a, b) => Math.abs(a.y - b.y) <= EPS7 ? "horizontal" : "vertical";
|
|
6089
|
+
|
|
6090
|
+
// lib/solvers/VccNetLabelCornerPlacementSolver/visualize.ts
|
|
6091
|
+
var CANDIDATE_SELECTED_COLOR3 = "blue";
|
|
6092
|
+
var CANDIDATE_REJECTED_COLOR3 = "red";
|
|
6093
|
+
var visualizeVccNetLabelCornerPlacementSolver = (state) => {
|
|
6094
|
+
const graphics = visualizeInputProblem(state.inputProblem);
|
|
6095
|
+
ensureGraphicsArrays2(graphics);
|
|
6096
|
+
drawTraces3(graphics, state.traces);
|
|
6097
|
+
drawNetLabels3(graphics, state.outputNetLabelPlacements);
|
|
6098
|
+
if (!state.solved) {
|
|
6099
|
+
drawCurrentLabel2(graphics, state.currentLabel);
|
|
6100
|
+
drawCurrentCandidates3(graphics, state.currentCandidateResults);
|
|
6101
|
+
}
|
|
6102
|
+
return graphics;
|
|
6103
|
+
};
|
|
6104
|
+
var drawTraces3 = (graphics, traces) => {
|
|
6105
|
+
for (const trace of traces) {
|
|
6106
|
+
graphics.lines.push({
|
|
6107
|
+
points: trace.tracePath,
|
|
6108
|
+
strokeColor: "purple"
|
|
6109
|
+
});
|
|
6110
|
+
}
|
|
6111
|
+
};
|
|
6112
|
+
var drawNetLabels3 = (graphics, labels) => {
|
|
6113
|
+
for (const label of labels) {
|
|
6114
|
+
graphics.rects.push({
|
|
6115
|
+
center: label.center,
|
|
6116
|
+
width: label.width,
|
|
6117
|
+
height: label.height,
|
|
6118
|
+
fill: getColorFromString(label.globalConnNetId, 0.35),
|
|
6119
|
+
strokeColor: getColorFromString(label.globalConnNetId, 0.9),
|
|
6120
|
+
label: `netId: ${label.netId}
|
|
6121
|
+
globalConnNetId: ${label.globalConnNetId}`
|
|
6122
|
+
});
|
|
6123
|
+
graphics.points.push({
|
|
6124
|
+
x: label.anchorPoint.x,
|
|
6125
|
+
y: label.anchorPoint.y,
|
|
6126
|
+
color: getColorFromString(label.globalConnNetId, 0.9),
|
|
6127
|
+
label: `anchorPoint
|
|
6128
|
+
orientation: ${label.orientation}`
|
|
6129
|
+
});
|
|
6130
|
+
}
|
|
6131
|
+
};
|
|
6132
|
+
var drawCurrentLabel2 = (graphics, currentLabel) => {
|
|
6133
|
+
if (!currentLabel) return;
|
|
6134
|
+
graphics.rects.push({
|
|
6135
|
+
center: currentLabel.center,
|
|
6136
|
+
width: currentLabel.width,
|
|
6137
|
+
height: currentLabel.height,
|
|
6138
|
+
fill: "rgba(255, 0, 0, 0.2)",
|
|
6139
|
+
strokeColor: CANDIDATE_REJECTED_COLOR3,
|
|
6140
|
+
label: `trace-line VCC target
|
|
6141
|
+
${currentLabel.netId ?? currentLabel.globalConnNetId}`
|
|
6142
|
+
});
|
|
6143
|
+
};
|
|
6144
|
+
var drawCurrentCandidates3 = (graphics, candidates) => {
|
|
6145
|
+
for (const candidate of candidates) {
|
|
6146
|
+
const color = candidate.selected ? CANDIDATE_SELECTED_COLOR3 : CANDIDATE_REJECTED_COLOR3;
|
|
6147
|
+
graphics.rects.push({
|
|
6148
|
+
center: candidate.center,
|
|
6149
|
+
width: candidate.width,
|
|
6150
|
+
height: candidate.height,
|
|
6151
|
+
fill: candidate.selected ? "rgba(0, 0, 255, 0.2)" : "rgba(255, 0, 0, 0.15)",
|
|
6152
|
+
strokeColor: color,
|
|
6153
|
+
strokeDash: candidate.selected ? void 0 : "4 2",
|
|
6154
|
+
label: `${candidate.selected ? "selected" : candidate.status} trace corner
|
|
6155
|
+
trace: ${candidate.traceId}
|
|
6156
|
+
distance: ${candidate.distance.toFixed(3)}`
|
|
6157
|
+
});
|
|
6158
|
+
graphics.points.push({
|
|
6159
|
+
...candidate.anchorPoint,
|
|
6160
|
+
color,
|
|
6161
|
+
label: `candidate anchor
|
|
6162
|
+
${candidate.status}`
|
|
6163
|
+
});
|
|
6164
|
+
}
|
|
6165
|
+
};
|
|
6166
|
+
var ensureGraphicsArrays2 = (graphics) => {
|
|
6167
|
+
if (!graphics.lines) graphics.lines = [];
|
|
6168
|
+
if (!graphics.points) graphics.points = [];
|
|
6169
|
+
if (!graphics.rects) graphics.rects = [];
|
|
6170
|
+
if (!graphics.circles) graphics.circles = [];
|
|
6171
|
+
if (!graphics.texts) graphics.texts = [];
|
|
6172
|
+
};
|
|
6173
|
+
|
|
6174
|
+
// lib/solvers/VccNetLabelCornerPlacementSolver/VccNetLabelCornerPlacementSolver.ts
|
|
6175
|
+
var VccNetLabelCornerPlacementSolver = class extends BaseSolver {
|
|
6176
|
+
inputProblem;
|
|
6177
|
+
traces;
|
|
6178
|
+
netLabelPlacements;
|
|
6179
|
+
outputNetLabelPlacements;
|
|
6180
|
+
queuedLabelIndices = [];
|
|
6181
|
+
currentLabelIndex = null;
|
|
6182
|
+
currentLabel = null;
|
|
6183
|
+
currentCandidateResults = [];
|
|
6184
|
+
queuedCornerCandidates = [];
|
|
6185
|
+
shouldAdvanceToNextLabel = false;
|
|
6186
|
+
traceMap;
|
|
6187
|
+
constructor(params) {
|
|
6188
|
+
super();
|
|
6189
|
+
this.inputProblem = params.inputProblem;
|
|
6190
|
+
this.traces = params.traces;
|
|
6191
|
+
this.netLabelPlacements = params.netLabelPlacements;
|
|
6192
|
+
this.outputNetLabelPlacements = [...params.netLabelPlacements];
|
|
6193
|
+
this.traceMap = Object.fromEntries(
|
|
6194
|
+
params.traces.map((trace) => [trace.mspPairId, trace])
|
|
6195
|
+
);
|
|
6196
|
+
this.queuedLabelIndices = this.getProcessableLabelIndices();
|
|
6197
|
+
this.prepareNextLabel();
|
|
6198
|
+
}
|
|
6199
|
+
getConstructorParams() {
|
|
6200
|
+
return {
|
|
6201
|
+
inputProblem: this.inputProblem,
|
|
6202
|
+
traces: this.traces,
|
|
6203
|
+
netLabelPlacements: this.netLabelPlacements
|
|
6204
|
+
};
|
|
6205
|
+
}
|
|
6206
|
+
_step() {
|
|
6207
|
+
if (this.shouldAdvanceToNextLabel) {
|
|
6208
|
+
this.advanceToNextLabel();
|
|
6209
|
+
return;
|
|
6210
|
+
}
|
|
6211
|
+
const label = this.currentLabel;
|
|
6212
|
+
const labelIndex = this.currentLabelIndex;
|
|
6213
|
+
if (label === null || labelIndex === null) {
|
|
6214
|
+
this.finish();
|
|
6215
|
+
return;
|
|
6216
|
+
}
|
|
6217
|
+
const candidate = this.queuedCornerCandidates.shift();
|
|
6218
|
+
if (!candidate) {
|
|
6219
|
+
this.shouldAdvanceToNextLabel = true;
|
|
6220
|
+
return;
|
|
6221
|
+
}
|
|
6222
|
+
const result = this.evaluateCornerCandidate(label, labelIndex, candidate);
|
|
6223
|
+
this.currentCandidateResults.push(result);
|
|
6224
|
+
if (result.status !== "valid") return;
|
|
6225
|
+
result.selected = true;
|
|
6226
|
+
this.applyCandidate(labelIndex, label, result);
|
|
6227
|
+
this.shouldAdvanceToNextLabel = true;
|
|
6228
|
+
}
|
|
6229
|
+
getOutput() {
|
|
6230
|
+
return {
|
|
6231
|
+
netLabelPlacements: this.outputNetLabelPlacements
|
|
6232
|
+
};
|
|
6233
|
+
}
|
|
6234
|
+
getProcessableLabelIndices() {
|
|
6235
|
+
const labelIndices = [];
|
|
6236
|
+
for (let i = 0; i < this.outputNetLabelPlacements.length; i++) {
|
|
6237
|
+
const label = this.outputNetLabelPlacements[i];
|
|
6238
|
+
if (!this.shouldProcessLabel(label)) continue;
|
|
6239
|
+
labelIndices.push(i);
|
|
6240
|
+
}
|
|
6241
|
+
return labelIndices;
|
|
6242
|
+
}
|
|
6243
|
+
prepareNextLabel() {
|
|
6244
|
+
const labelIndex = this.queuedLabelIndices.shift();
|
|
6245
|
+
if (labelIndex === void 0) {
|
|
6246
|
+
this.clearCurrentLabel();
|
|
6247
|
+
return false;
|
|
6248
|
+
}
|
|
6249
|
+
const label = this.outputNetLabelPlacements[labelIndex];
|
|
6250
|
+
this.currentLabelIndex = labelIndex;
|
|
6251
|
+
this.currentLabel = label;
|
|
6252
|
+
this.currentCandidateResults = [];
|
|
6253
|
+
this.queuedCornerCandidates = this.getCornerCandidatesForLabel(label);
|
|
6254
|
+
return true;
|
|
6255
|
+
}
|
|
6256
|
+
advanceToNextLabel() {
|
|
6257
|
+
this.shouldAdvanceToNextLabel = false;
|
|
6258
|
+
if (!this.prepareNextLabel()) this.finish();
|
|
6259
|
+
}
|
|
6260
|
+
clearCurrentLabel() {
|
|
6261
|
+
this.currentLabelIndex = null;
|
|
6262
|
+
this.currentLabel = null;
|
|
6263
|
+
this.currentCandidateResults = [];
|
|
6264
|
+
this.queuedCornerCandidates = [];
|
|
6265
|
+
}
|
|
6266
|
+
finish() {
|
|
6267
|
+
this.clearCurrentLabel();
|
|
6268
|
+
this.solved = true;
|
|
6269
|
+
}
|
|
6270
|
+
evaluateCornerCandidate(label, labelIndex, candidate) {
|
|
6271
|
+
const center = getCenterFromAnchor(
|
|
6272
|
+
candidate.anchorPoint,
|
|
6273
|
+
label.orientation,
|
|
6274
|
+
label.width,
|
|
6275
|
+
label.height
|
|
6276
|
+
);
|
|
6277
|
+
const bounds = getRectBounds(center, label.width, label.height);
|
|
6278
|
+
return {
|
|
6279
|
+
...candidate,
|
|
6280
|
+
center,
|
|
6281
|
+
width: label.width,
|
|
6282
|
+
height: label.height,
|
|
6283
|
+
status: this.getCandidateStatus(bounds, labelIndex),
|
|
6284
|
+
selected: false
|
|
6285
|
+
};
|
|
6286
|
+
}
|
|
6287
|
+
getCandidateStatus(bounds, labelIndex) {
|
|
6288
|
+
if (this.intersectsAnyChip(bounds)) return "chip-collision";
|
|
6289
|
+
if (traceCrossesBoundsInterior(bounds, this.traceMap)) {
|
|
6290
|
+
return "trace-collision";
|
|
6291
|
+
}
|
|
6292
|
+
if (this.intersectsAnyOtherNetLabel(bounds, labelIndex)) {
|
|
6293
|
+
return "netlabel-collision";
|
|
6294
|
+
}
|
|
6295
|
+
return "valid";
|
|
6296
|
+
}
|
|
6297
|
+
applyCandidate(labelIndex, label, candidate) {
|
|
6298
|
+
this.outputNetLabelPlacements[labelIndex] = {
|
|
6299
|
+
...label,
|
|
6300
|
+
anchorPoint: candidate.anchorPoint,
|
|
6301
|
+
center: candidate.center
|
|
6302
|
+
};
|
|
6303
|
+
}
|
|
6304
|
+
shouldProcessLabel(label) {
|
|
6305
|
+
return label.netId === "VCC" && this.getCornerCandidatesForLabel(label).length > 0;
|
|
6306
|
+
}
|
|
6307
|
+
intersectsAnyChip(bounds) {
|
|
6308
|
+
return this.inputProblem.chips.some(
|
|
6309
|
+
(chip) => rectsOverlap2(bounds, getRectBounds(chip.center, chip.width, chip.height))
|
|
6310
|
+
);
|
|
6311
|
+
}
|
|
6312
|
+
intersectsAnyOtherNetLabel(bounds, labelIndex) {
|
|
6313
|
+
return this.outputNetLabelPlacements.some((label, index) => {
|
|
6314
|
+
if (index === labelIndex) return false;
|
|
6315
|
+
return rectsOverlap2(
|
|
6316
|
+
bounds,
|
|
6317
|
+
getRectBounds(label.center, label.width, label.height)
|
|
6318
|
+
);
|
|
6319
|
+
});
|
|
6320
|
+
}
|
|
6321
|
+
getCornerCandidatesForLabel(label) {
|
|
6322
|
+
const candidates = [];
|
|
6323
|
+
const seenCornerKeys = /* @__PURE__ */ new Set();
|
|
6324
|
+
for (const trace of this.getTraceLinesForLabel(label)) {
|
|
6325
|
+
for (const anchorPoint of getTraceCorners(trace.tracePath)) {
|
|
6326
|
+
const key = `${anchorPoint.x}:${anchorPoint.y}`;
|
|
6327
|
+
if (seenCornerKeys.has(key)) continue;
|
|
6328
|
+
seenCornerKeys.add(key);
|
|
6329
|
+
candidates.push({
|
|
6330
|
+
anchorPoint,
|
|
6331
|
+
traceId: trace.mspPairId,
|
|
6332
|
+
distance: getDistance2(anchorPoint, label.anchorPoint)
|
|
6333
|
+
});
|
|
6334
|
+
}
|
|
6335
|
+
}
|
|
6336
|
+
return candidates.sort((a, b) => a.distance - b.distance);
|
|
6337
|
+
}
|
|
6338
|
+
getTraceLinesForLabel(label) {
|
|
6339
|
+
return this.traces.filter(
|
|
6340
|
+
(trace) => isTraceLine(trace) && this.isTraceForLabel(trace, label)
|
|
6341
|
+
);
|
|
6342
|
+
}
|
|
6343
|
+
isTraceForLabel(trace, label) {
|
|
6344
|
+
if (!tracePathContainsPoint(trace.tracePath, label.anchorPoint)) {
|
|
6345
|
+
return false;
|
|
6346
|
+
}
|
|
6347
|
+
const traceIds = new Set(label.mspConnectionPairIds);
|
|
6348
|
+
if (traceIds.size > 0) {
|
|
6349
|
+
return traceIds.has(trace.mspPairId);
|
|
6350
|
+
}
|
|
6351
|
+
return trace.globalConnNetId === label.globalConnNetId;
|
|
6352
|
+
}
|
|
6353
|
+
visualize() {
|
|
6354
|
+
return visualizeVccNetLabelCornerPlacementSolver({
|
|
6355
|
+
inputProblem: this.inputProblem,
|
|
6356
|
+
traces: this.traces,
|
|
6357
|
+
outputNetLabelPlacements: this.outputNetLabelPlacements,
|
|
6358
|
+
currentLabel: this.currentLabel,
|
|
6359
|
+
currentCandidateResults: this.currentCandidateResults,
|
|
6360
|
+
solved: this.solved
|
|
6361
|
+
});
|
|
6362
|
+
}
|
|
6363
|
+
};
|
|
6364
|
+
|
|
6057
6365
|
// lib/solvers/SchematicTracePipelineSolver/SchematicTracePipelineSolver.ts
|
|
6058
6366
|
function definePipelineStep(solverName, solverClass, getConstructorParams, opts = {}) {
|
|
6059
6367
|
return {
|
|
@@ -6076,6 +6384,7 @@ var SchematicTracePipelineSolver = class extends BaseSolver {
|
|
|
6076
6384
|
traceCleanupSolver;
|
|
6077
6385
|
example28Solver;
|
|
6078
6386
|
availableNetOrientationSolver;
|
|
6387
|
+
vccNetLabelCornerPlacementSolver;
|
|
6079
6388
|
startTimeOfPhase;
|
|
6080
6389
|
endTimeOfPhase;
|
|
6081
6390
|
timeSpentOnPhase;
|
|
@@ -6232,6 +6541,19 @@ var SchematicTracePipelineSolver = class extends BaseSolver {
|
|
|
6232
6541
|
netLabelPlacements: instance.example28Solver.outputNetLabelPlacements
|
|
6233
6542
|
}
|
|
6234
6543
|
]
|
|
6544
|
+
),
|
|
6545
|
+
definePipelineStep(
|
|
6546
|
+
"vccNetLabelCornerPlacementSolver",
|
|
6547
|
+
VccNetLabelCornerPlacementSolver,
|
|
6548
|
+
(instance) => {
|
|
6549
|
+
return [
|
|
6550
|
+
{
|
|
6551
|
+
inputProblem: instance.inputProblem,
|
|
6552
|
+
traces: instance.availableNetOrientationSolver.traces,
|
|
6553
|
+
netLabelPlacements: instance.availableNetOrientationSolver.outputNetLabelPlacements
|
|
6554
|
+
}
|
|
6555
|
+
];
|
|
6556
|
+
}
|
|
6235
6557
|
)
|
|
6236
6558
|
];
|
|
6237
6559
|
constructor(inputProblem) {
|
|
@@ -22,6 +22,7 @@ import { MergedNetLabelObstacleSolver } from "../TraceLabelOverlapAvoidanceSolve
|
|
|
22
22
|
import { TraceCleanupSolver } from "../TraceCleanupSolver/TraceCleanupSolver"
|
|
23
23
|
import { Example28Solver } from "../Example28Solver/Example28Solver"
|
|
24
24
|
import { AvailableNetOrientationSolver } from "../AvailableNetOrientationSolver/AvailableNetOrientationSolver"
|
|
25
|
+
import { VccNetLabelCornerPlacementSolver } from "../VccNetLabelCornerPlacementSolver/VccNetLabelCornerPlacementSolver"
|
|
25
26
|
|
|
26
27
|
type PipelineStep<T extends new (...args: any[]) => BaseSolver> = {
|
|
27
28
|
solverName: string
|
|
@@ -73,6 +74,7 @@ export class SchematicTracePipelineSolver extends BaseSolver {
|
|
|
73
74
|
traceCleanupSolver?: TraceCleanupSolver
|
|
74
75
|
example28Solver?: Example28Solver
|
|
75
76
|
availableNetOrientationSolver?: AvailableNetOrientationSolver
|
|
77
|
+
vccNetLabelCornerPlacementSolver?: VccNetLabelCornerPlacementSolver
|
|
76
78
|
|
|
77
79
|
startTimeOfPhase: Record<string, number>
|
|
78
80
|
endTimeOfPhase: Record<string, number>
|
|
@@ -254,6 +256,20 @@ export class SchematicTracePipelineSolver extends BaseSolver {
|
|
|
254
256
|
},
|
|
255
257
|
],
|
|
256
258
|
),
|
|
259
|
+
definePipelineStep(
|
|
260
|
+
"vccNetLabelCornerPlacementSolver",
|
|
261
|
+
VccNetLabelCornerPlacementSolver,
|
|
262
|
+
(instance) => {
|
|
263
|
+
return [
|
|
264
|
+
{
|
|
265
|
+
inputProblem: instance.inputProblem,
|
|
266
|
+
traces: instance.availableNetOrientationSolver!.traces,
|
|
267
|
+
netLabelPlacements:
|
|
268
|
+
instance.availableNetOrientationSolver!.outputNetLabelPlacements,
|
|
269
|
+
},
|
|
270
|
+
]
|
|
271
|
+
},
|
|
272
|
+
),
|
|
257
273
|
]
|
|
258
274
|
|
|
259
275
|
constructor(inputProblem: InputProblem) {
|