rework structure of everything

examples/02_congestion_resolution.py

@@ -1,49 +1,41 @@
-from inire.geometry.collision import CollisionEngine
-from inire.geometry.primitives import Port
-from inire.router.astar import AStarContext, AStarMetrics
-from inire.router.cost import CostEvaluator
-from inire.router.danger_map import DangerMap
-from inire.router.pathfinder import PathFinder
+from inire import CongestionOptions, NetSpec, ObjectiveWeights, Port, RoutingOptions, RoutingProblem, SearchOptions, route
 from inire.utils.visualization import plot_routing_results
 
 
 def main() -> None:
     print("Running Example 02: Congestion Resolution (Triple Crossing)...")
 
-    # 1. Setup Environment
     bounds = (0, 0, 100, 100)
-    engine = CollisionEngine(clearance=2.0)
-    danger_map = DangerMap(bounds=bounds)
-    danger_map.precompute([])
-
-    # Configure a router with high congestion penalties
-    evaluator = CostEvaluator(engine, danger_map, greedy_h_weight=1.5, bend_penalty=250.0, sbend_penalty=500.0)
-    context = AStarContext(evaluator, bend_radii=[10.0], sbend_radii=[10.0])
-    metrics = AStarMetrics()
-    pf = PathFinder(context, metrics, base_congestion_penalty=1000.0)
-
-    # 2. Define Netlist
-    # Three nets that must cross each other in a small area
     netlist = {
         "horizontal": (Port(10, 50, 0), Port(90, 50, 0)),
         "vertical_up": (Port(45, 10, 90), Port(45, 90, 90)),
         "vertical_down": (Port(55, 90, 270), Port(55, 10, 270)),
     }
-    net_widths = {nid: 2.0 for nid in netlist}
+    problem = RoutingProblem(
+        bounds=bounds,
+        nets=tuple(NetSpec(net_id, start, target, width=2.0) for net_id, (start, target) in netlist.items()),
+    )
+    options = RoutingOptions(
+        search=SearchOptions(
+            bend_radii=(10.0,),
+            sbend_radii=(10.0,),
+            greedy_h_weight=1.5,
+        ),
+        objective=ObjectiveWeights(
+            bend_penalty=250.0,
+            sbend_penalty=500.0,
+        ),
+        congestion=CongestionOptions(base_penalty=1000.0),
+    )
 
-    # 3. Route
-    # PathFinder uses Negotiated Congestion to resolve overlaps iteratively
-    results = pf.route_all(netlist, net_widths)
-
-    # 4. Check Results
-    all_valid = all(res.is_valid for res in results.values())
+    run = route(problem, options=options)
+    all_valid = all(result.is_valid for result in run.results_by_net.values())
     if all_valid:
         print("Success! Congestion resolved for all nets.")
     else:
         print("Failed to resolve congestion for some nets.")
 
-    # 5. Visualize
-    fig, ax = plot_routing_results(results, [], bounds, netlist=netlist)
+    fig, _ax = plot_routing_results(run.results_by_net, [], bounds, netlist=netlist)
     fig.savefig("examples/02_congestion_resolution.png")
     print("Saved plot to examples/02_congestion_resolution.png")