Skip to content

Commit c918754

Browse files
committed
mesh phase working
1 parent 97252ed commit c918754

File tree

2 files changed

+28
-3
lines changed

2 files changed

+28
-3
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import { AutoroutingPipelineDebugger } from "lib/testing/AutoroutingPipelineDebugger"
2+
import { AssignableViaAutoroutingPipelineSolver } from "lib/solvers/AssignableViaAutoroutingPipeline/AssignableViaAutoroutingPipelineSolver"
3+
4+
import { GenericSolverDebugger } from "lib/testing/GenericSolverDebugger"
5+
import { LoopedReassignmentZeroViaSolver } from "lib/solvers/LoopedReassignmentZeroViaSolver/LoopedReassignmentZeroViaSolver"
6+
import simpleRouteJson from "../LoopedReassignmentZeroViaSolver/LoopedReassignmentZeroViaSolver02.json"
7+
import { SimpleRouteJson } from "lib/types"
8+
9+
function makeViasAssignable(srj: SimpleRouteJson) {
10+
return {
11+
...srj,
12+
obstacles: srj.obstacles.map((obstacle) => ({
13+
...obstacle,
14+
netIsAssignable:
15+
obstacle.connectedTo.length === 0 && obstacle.layers.length === 2,
16+
})),
17+
}
18+
}
19+
20+
export default () => (
21+
<AutoroutingPipelineDebugger
22+
createSolver={(srj, opts) =>
23+
new AssignableViaAutoroutingPipelineSolver(srj, opts)
24+
}
25+
srj={makeViasAssignable(simpleRouteJson as SimpleRouteJson)}
26+
/>
27+
)

lib/solvers/AssignableViaAutoroutingPipeline/CapacityMeshNodeSolver_OnlyTraverseLayersInAssignableObstacles.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,7 @@ export class CapacityMeshNodeSolver_OnlyTraverseLayersInAssignableObstacles exte
6161
private getAssignableContainer(node: CapacityMeshNode): Obstacle | null {
6262
const assignables = this.getOverlappingAssignableObstacles(node)
6363
for (const o of assignables) {
64-
if (this.isNodeCompletelyInsideSpecificObstacle(node, o)) {
65-
return o
66-
}
64+
return o
6765
}
6866
return null
6967
}

0 commit comments

Comments
 (0)