Skip to content
Merged
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 @@ -107,11 +107,10 @@ export class MultiHeadPolyLineIntraNodeSolver extends BaseSolver {
).size
this.uniqueConnections = uniqueConnections

const { numSameLayerCrossings, numTransitions } = getIntraNodeCrossings(
this.nodeWithPortPoints,
)
const { numSameLayerCrossings, numEntryExitLayerChanges } =
getIntraNodeCrossings(this.nodeWithPortPoints)

this.minViaCount = numSameLayerCrossings * 2 + numTransitions
this.minViaCount = numSameLayerCrossings * 2 + numEntryExitLayerChanges
this.maxViaCount = Math.min(
Math.floor(areaInsideNode / areaPerVia),
Math.ceil(uniqueConnections * 1.5),
Expand Down
6 changes: 1 addition & 5 deletions lib/utils/getIntraNodeCrossings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ export const getIntraNodeCrossings = (node: NodeWithPortPoints) => {
connectionName: string
}[] = []

let numEntryExitLayerChanges = 0

for (const A of node.portPoints) {
if (pointPairs.some((p) => p.connectionName === A.connectionName)) {
continue
Expand All @@ -37,7 +35,6 @@ export const getIntraNodeCrossings = (node: NodeWithPortPoints) => {
pointPair.points.push({ x: B.x, y: B.y, z: B.z })
}
if (pointPair.points.some((p) => p.z !== pointPair.z)) {
numEntryExitLayerChanges++
transitionPairPoints.push(pointPair)
continue
}
Expand Down Expand Up @@ -86,8 +83,7 @@ export const getIntraNodeCrossings = (node: NodeWithPortPoints) => {

return {
numSameLayerCrossings,
numEntryExitLayerChanges,
numEntryExitLayerChanges: transitionPairPoints.length,
numTransitionPairCrossings,
numTransitions: transitionPairPoints.length,
}
}
Loading