refactor(autorouter/autorouter): Do some renaming to distinguish multilayer from planar

committed.toml

@@ -28,8 +28,8 @@ allowed_scopes = [
   "autorouter/invoker",
   "autorouter/measure_length",
   "autorouter/multilayer_autoroute",
-  "autorouter/permutator",
-  "autorouter/permuter",
+  "autorouter/planar_permutator",
+  "autorouter/planar_permuter",
   "autorouter/place_via",
   "autorouter/planar_autoroute",
   "autorouter/planner",

src/autorouter/autorouter.rs

@@ -13,7 +13,7 @@ use thiserror::Error;
 use crate::{
     autorouter::{
         multilayer_autoroute::{MultilayerAutorouteExecutionStepper, MultilayerAutorouteOptions},
-        permutator::PlanarAutorouteExecutionPermutator,
+        planar_permutator::PlanarAutorouteExecutionPermutator,
         planner::Planner,
         ratsnests::Ratsnests,
     },

src/autorouter/execution.rs

@@ -10,7 +10,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     autorouter::{
         multilayer_autoroute::{MultilayerAutorouteExecutionStepper, MultilayerAutorouteOptions},
-        permutator::PlanarAutorouteExecutionPermutator,
+        planar_permutator::PlanarAutorouteExecutionPermutator,
     },
     board::{edit::BoardEdit, AccessMesadata},
     layout::via::ViaWeight,

src/autorouter/invoker.rs

@@ -33,8 +33,8 @@ use super::{
     history::{History, HistoryError},
     measure_length::MeasureLengthExecutionStepper,
     multilayer_autoroute::MultilayerAutorouteExecutionStepper,
-    permutator::PlanarAutorouteExecutionPermutator,
     place_via::PlaceViaExecutionStepper,
+    planar_permutator::PlanarAutorouteExecutionPermutator,
     remove_bands::RemoveBandsExecutionStepper,
     Autorouter, AutorouterError,
 };

src/autorouter/mod.rs

@@ -12,10 +12,10 @@ pub mod history;
 pub mod invoker;
 pub mod measure_length;
 pub mod multilayer_autoroute;
-pub mod permutator;
-pub mod permuter;
 pub mod place_via;
 pub mod planar_autoroute;
+pub mod planar_permutator;
+pub mod planar_permuter;
 pub mod planner;
 pub mod pointroute;
 pub mod presorter;

src/autorouter/multilayer_autoroute.rs

@@ -11,8 +11,8 @@ use crate::{
     autorouter::{
         anterouter::{Anterouter, AnterouterOptions, AnterouterPlan},
         invoker::GetDebugOverlayData,
-        permutator::PlanarAutorouteExecutionPermutator,
         planar_autoroute::PlanarAutorouteContinueStatus,
+        planar_permutator::PlanarAutorouteExecutionPermutator,
         ratline::RatlineUid,
         Autorouter, AutorouterError, PlanarAutorouteOptions,
     },

src/autorouter/planar_permutator.rs

@@ -9,8 +9,8 @@ use specctra_core::mesadata::AccessMesadata;
 use crate::{
     autorouter::{
         invoker::GetDebugOverlayData,
-        permuter::{PermuteRatlines, RatlinesPermuter},
         planar_autoroute::{PlanarAutorouteContinueStatus, PlanarAutorouteExecutionStepper},
+        planar_permuter::{PermuteRatlines, RatlinePermuter},
         presorter::{PresortParams, PresortRatlines, SccIntersectionsAndLengthPresorter},
         ratline::RatlineUid,
         Autorouter, AutorouterError, PlanarAutorouteOptions,
@@ -24,7 +24,7 @@ use crate::{
 
 pub struct PlanarAutorouteExecutionPermutator {
     stepper: PlanarAutorouteExecutionStepper,
-    permuter: RatlinesPermuter,
+    permuter: RatlinePermuter,
     options: PlanarAutorouteOptions,
 }
 
@@ -47,7 +47,7 @@ impl PlanarAutorouteExecutionPermutator {
         /*let permuter = RatlinesPermuter::SccPermutations(SccPermutationsRatlinePermuter::new(
             autorouter, ratlines, presorter, &options,
         ));*/
-        let permuter = RatlinesPermuter::new(autorouter, ratlines, presorter, &options);
+        let permuter = RatlinePermuter::new(autorouter, ratlines, presorter, &options);
 
         Ok(Self {
             stepper: PlanarAutorouteExecutionStepper::new(

src/autorouter/planar_permuter.rs

@@ -29,19 +29,19 @@ pub trait PermuteRatlines {
 }
 
 #[enum_dispatch(PermuteRatlines)]
-pub enum RatlinesPermuter {
+pub enum RatlinePermuter {
     RatlineCuts(RatlineCutsRatlinePermuter),
     SccPermutations(SccPermutationsRatlinePermuter),
 }
 
-impl RatlinesPermuter {
+impl RatlinePermuter {
     pub fn new(
         autorouter: &mut Autorouter<impl AccessMesadata>,
         ratlines: Vec<RatlineUid>,
         presorter: SccIntersectionsAndLengthPresorter,
         options: &PlanarAutorouteOptions,
     ) -> Self {
-        RatlinesPermuter::SccPermutations(SccPermutationsRatlinePermuter::new(
+        RatlinePermuter::SccPermutations(SccPermutationsRatlinePermuter::new(
             autorouter, ratlines, presorter, options,
         ))
         /*RatlinesPermuter::RatlineCuts(RatlineCutsRatlinePermuter::new(