diff --git a/config/simulations/Circle Experiment/config.toml b/config/scenarios/Circle Experiment/config.toml similarity index 94% rename from config/simulations/Circle Experiment/config.toml rename to config/scenarios/Circle Experiment/config.toml index 132c360..4ddf4a0 100644 --- a/config/simulations/Circle Experiment/config.toml +++ b/config/scenarios/Circle Experiment/config.toml @@ -1,7 +1,7 @@ # environment = "junction" environment_image = "empty" -environment = "./config/simulations/ClearCircle/environment.yaml" -formation_group = "./config/simulations/ClearCircle/formation.ron" +environment = "./config/scenarios/ClearCircle/environment.yaml" +formation_group = "./config/scenarios/ClearCircle/formation.ron" [interaction] ui-focus-cancels-inputs = true diff --git a/config/simulations/Circle Experiment/environment.yaml b/config/scenarios/Circle Experiment/environment.yaml similarity index 100% rename from config/simulations/Circle Experiment/environment.yaml rename to config/scenarios/Circle Experiment/environment.yaml diff --git a/config/simulations/Circle Experiment/formation.yaml b/config/scenarios/Circle Experiment/formation.yaml similarity index 100% rename from config/simulations/Circle Experiment/formation.yaml rename to config/scenarios/Circle Experiment/formation.yaml diff --git a/config/simulations/Collaborative Complex/config.toml b/config/scenarios/Collaborative Complex/config.toml similarity index 93% rename from config/simulations/Collaborative Complex/config.toml rename to config/scenarios/Collaborative Complex/config.toml index fe509c0..28eec83 100755 --- a/config/simulations/Collaborative Complex/config.toml +++ b/config/scenarios/Collaborative Complex/config.toml @@ -1,6 +1,6 @@ environment_image = "junction_twoway" -environment = "./config/simulations/Intersection/environment.yaml" -formation_group = "./config/simulations/Intersection/formation.ron" +environment = "./config/scenarios/Intersection/environment.yaml" +formation_group = "./config/scenarios/Intersection/formation.ron" [visualisation.height] objects = 0.5 diff --git a/config/simulations/Collaborative Complex/environment.yaml b/config/scenarios/Collaborative Complex/environment.yaml similarity index 100% rename from config/simulations/Collaborative Complex/environment.yaml rename to config/scenarios/Collaborative Complex/environment.yaml diff --git a/config/simulations/Collaborative Complex/formation.yaml b/config/scenarios/Collaborative Complex/formation.yaml similarity index 100% rename from config/simulations/Collaborative Complex/formation.yaml rename to config/scenarios/Collaborative Complex/formation.yaml diff --git a/config/simulations/Collaborative GP/config.toml b/config/scenarios/Collaborative GP/config.toml similarity index 93% rename from config/simulations/Collaborative GP/config.toml rename to config/scenarios/Collaborative GP/config.toml index b393c88..33b97b3 100644 --- a/config/simulations/Collaborative GP/config.toml +++ b/config/scenarios/Collaborative GP/config.toml @@ -1,6 +1,6 @@ environment_image = "junction_twoway" -environment = "./config/simulations/Collaborative GP/environment.yaml" -formation_group = "./config/simulations/Collaborative GP/formation.ron" +environment = "./config/scenarios/Collaborative GP/environment.yaml" +formation_group = "./config/scenarios/Collaborative GP/formation.ron" [visualisation.height] objects = 0.5 diff --git a/config/simulations/Collaborative GP/environment.yaml b/config/scenarios/Collaborative GP/environment.yaml similarity index 100% rename from config/simulations/Collaborative GP/environment.yaml rename to config/scenarios/Collaborative GP/environment.yaml diff --git a/config/simulations/Collaborative GP/formation.yaml b/config/scenarios/Collaborative GP/formation.yaml similarity index 100% rename from config/simulations/Collaborative GP/formation.yaml rename to config/scenarios/Collaborative GP/formation.yaml diff --git a/config/simulations/Communications Failure Experiment/config.toml b/config/scenarios/Communications Failure Experiment/config.toml similarity index 94% rename from config/simulations/Communications Failure Experiment/config.toml rename to config/scenarios/Communications Failure Experiment/config.toml index b510528..f8aaec5 100644 --- a/config/simulations/Communications Failure Experiment/config.toml +++ b/config/scenarios/Communications Failure Experiment/config.toml @@ -1,6 +1,6 @@ environment_image = "circle_cluttered" -environment = "./config/simulations/Circle/environment.yaml" -formation_group = "./config/simulations/Circle/formation.ron" +environment = "./config/scenarios/Circle/environment.yaml" +formation_group = "./config/scenarios/Circle/formation.ron" [visualisation.height] objects = 0.5 diff --git a/config/simulations/Communications Failure Experiment/environment.yaml b/config/scenarios/Communications Failure Experiment/environment.yaml similarity index 100% rename from config/simulations/Communications Failure Experiment/environment.yaml rename to config/scenarios/Communications Failure Experiment/environment.yaml diff --git a/config/simulations/Communications Failure Experiment/formation.yaml b/config/scenarios/Communications Failure Experiment/formation.yaml similarity index 100% rename from config/simulations/Communications Failure Experiment/formation.yaml rename to config/scenarios/Communications Failure Experiment/formation.yaml diff --git a/config/simulations/Environment Obstacles Experiment/config.toml b/config/scenarios/Environment Obstacles Experiment/config.toml similarity index 95% rename from config/simulations/Environment Obstacles Experiment/config.toml rename to config/scenarios/Environment Obstacles Experiment/config.toml index ca8a913..7aab9dc 100644 --- a/config/simulations/Environment Obstacles Experiment/config.toml +++ b/config/scenarios/Environment Obstacles Experiment/config.toml @@ -1,7 +1,7 @@ # environment = "junction" environment_image = "circle_cluttered" -environment = "./config/simulations/Circle/environment.yaml" -formation_group = "./config/simulations/Circle/formation.ron" +environment = "./config/scenarios/Circle/environment.yaml" +formation_group = "./config/scenarios/Circle/formation.ron" [interaction] ui-focus-cancels-inputs = true diff --git a/config/simulations/Environment Obstacles Experiment/environment.yaml b/config/scenarios/Environment Obstacles Experiment/environment.yaml similarity index 100% rename from config/simulations/Environment Obstacles Experiment/environment.yaml rename to config/scenarios/Environment Obstacles Experiment/environment.yaml diff --git a/config/simulations/Environment Obstacles Experiment/formation.yaml b/config/scenarios/Environment Obstacles Experiment/formation.yaml similarity index 100% rename from config/simulations/Environment Obstacles Experiment/formation.yaml rename to config/scenarios/Environment Obstacles Experiment/formation.yaml diff --git a/config/simulations/Iteration Amount Experiment/config.toml b/config/scenarios/Iteration Amount Experiment/config.toml similarity index 94% rename from config/simulations/Iteration Amount Experiment/config.toml rename to config/scenarios/Iteration Amount Experiment/config.toml index 03fc5a6..a100d98 100644 --- a/config/simulations/Iteration Amount Experiment/config.toml +++ b/config/scenarios/Iteration Amount Experiment/config.toml @@ -1,6 +1,6 @@ environment_image = "empty" -environment = "./config/simulations/ClearCircle/environment.yaml" -formation_group = "./config/simulations/ClearCircle/formation.ron" +environment = "./config/scenarios/ClearCircle/environment.yaml" +formation_group = "./config/scenarios/ClearCircle/formation.ron" [visualisation.height] objects = 0.5 diff --git a/config/simulations/Iteration Amount Experiment/environment.yaml b/config/scenarios/Iteration Amount Experiment/environment.yaml similarity index 100% rename from config/simulations/Iteration Amount Experiment/environment.yaml rename to config/scenarios/Iteration Amount Experiment/environment.yaml diff --git a/config/simulations/Iteration Amount Experiment/formation.yaml b/config/scenarios/Iteration Amount Experiment/formation.yaml similarity index 100% rename from config/simulations/Iteration Amount Experiment/formation.yaml rename to config/scenarios/Iteration Amount Experiment/formation.yaml diff --git a/config/simulations/Junction Experiment/config.toml b/config/scenarios/Junction Experiment/config.toml similarity index 94% rename from config/simulations/Junction Experiment/config.toml rename to config/scenarios/Junction Experiment/config.toml index 03e8de5..73bd752 100644 --- a/config/simulations/Junction Experiment/config.toml +++ b/config/scenarios/Junction Experiment/config.toml @@ -1,6 +1,6 @@ environment_image = "junction_twoway" -environment = "./config/simulations/Intersection/environment.yaml" -formation_group = "./config/simulations/Intersection/formation.ron" +environment = "./config/scenarios/Intersection/environment.yaml" +formation_group = "./config/scenarios/Intersection/formation.ron" [visualisation.height] objects = 0.5 diff --git a/config/simulations/Junction Experiment/environment.yaml b/config/scenarios/Junction Experiment/environment.yaml similarity index 100% rename from config/simulations/Junction Experiment/environment.yaml rename to config/scenarios/Junction Experiment/environment.yaml diff --git a/config/simulations/Junction Experiment/formation.yaml b/config/scenarios/Junction Experiment/formation.yaml similarity index 100% rename from config/simulations/Junction Experiment/formation.yaml rename to config/scenarios/Junction Experiment/formation.yaml diff --git a/config/simulations/Junction Twoway/config.toml b/config/scenarios/Junction Twoway/config.toml similarity index 94% rename from config/simulations/Junction Twoway/config.toml rename to config/scenarios/Junction Twoway/config.toml index 742e760..67ec364 100644 --- a/config/simulations/Junction Twoway/config.toml +++ b/config/scenarios/Junction Twoway/config.toml @@ -1,6 +1,6 @@ environment_image = "junction_twoway" -environment = "./config/simulations/Intersection/environment.yaml" -formation_group = "./config/simulations/Intersection/formation.ron" +environment = "./config/scenarios/Intersection/environment.yaml" +formation_group = "./config/scenarios/Intersection/formation.ron" [visualisation.height] objects = 0.5 diff --git a/config/simulations/Junction Twoway/environment.yaml b/config/scenarios/Junction Twoway/environment.yaml similarity index 100% rename from config/simulations/Junction Twoway/environment.yaml rename to config/scenarios/Junction Twoway/environment.yaml diff --git a/config/simulations/Junction Twoway/formation.yaml b/config/scenarios/Junction Twoway/formation.yaml similarity index 100% rename from config/simulations/Junction Twoway/formation.yaml rename to config/scenarios/Junction Twoway/formation.yaml diff --git a/config/simulations/Merge/config.toml b/config/scenarios/Merge/config.toml similarity index 94% rename from config/simulations/Merge/config.toml rename to config/scenarios/Merge/config.toml index 98b974a..66968d7 100644 --- a/config/simulations/Merge/config.toml +++ b/config/scenarios/Merge/config.toml @@ -1,6 +1,6 @@ environment_image = "junction_twoway" -environment = "./config/simulations/Merge/environment.yaml" -formation_group = "./config/simulations/Merge/formation.yaml" +environment = "./config/scenarios/Merge/environment.yaml" +formation_group = "./config/scenarios/Merge/formation.yaml" [visualisation.height] objects = 0.5 diff --git a/config/simulations/Merge/environment.yaml b/config/scenarios/Merge/environment.yaml similarity index 99% rename from config/simulations/Merge/environment.yaml rename to config/scenarios/Merge/environment.yaml index e19cab1..b7a8dc4 100644 --- a/config/simulations/Merge/environment.yaml +++ b/config/scenarios/Merge/environment.yaml @@ -185,7 +185,7 @@ obstacles: tile-coordinates: row: 2 col: 3 - + - shape: !polygon points: - x: 0.0 @@ -336,4 +336,4 @@ obstacles: y: 0.0 tile-coordinates: row: 1 - col: 3 \ No newline at end of file + col: 3 diff --git a/config/simulations/Merge/formation.yaml b/config/scenarios/Merge/formation.yaml similarity index 98% rename from config/simulations/Merge/formation.yaml rename to config/scenarios/Merge/formation.yaml index 026e6f6..3c3a7a1 100644 --- a/config/simulations/Merge/formation.yaml +++ b/config/scenarios/Merge/formation.yaml @@ -105,4 +105,4 @@ formations: intersects-with: horizon finished-when-intersects: distance: !meter 40 - intersects-with: current \ No newline at end of file + intersects-with: current diff --git a/config/simulations/Obstacle Shapes Showcase/config.toml b/config/scenarios/Obstacle Shapes Showcase/config.toml similarity index 95% rename from config/simulations/Obstacle Shapes Showcase/config.toml rename to config/scenarios/Obstacle Shapes Showcase/config.toml index e380218..e275e5c 100644 --- a/config/simulations/Obstacle Shapes Showcase/config.toml +++ b/config/scenarios/Obstacle Shapes Showcase/config.toml @@ -1,6 +1,6 @@ environment_image = "circle_cluttered" -environment = "./config/simulations/Circle/environment.yaml" -formation_group = "./config/simulations/Circle/formation.ron" +environment = "./config/scenarios/Circle/environment.yaml" +formation_group = "./config/scenarios/Circle/formation.ron" [visualisation.height] objects = 0.5 diff --git a/config/simulations/Obstacle Shapes Showcase/environment.yaml b/config/scenarios/Obstacle Shapes Showcase/environment.yaml similarity index 100% rename from config/simulations/Obstacle Shapes Showcase/environment.yaml rename to config/scenarios/Obstacle Shapes Showcase/environment.yaml diff --git a/config/simulations/Obstacle Shapes Showcase/formation.yaml b/config/scenarios/Obstacle Shapes Showcase/formation.yaml similarity index 100% rename from config/simulations/Obstacle Shapes Showcase/formation.yaml rename to config/scenarios/Obstacle Shapes Showcase/formation.yaml diff --git a/config/simulations/Schedules Experiment/config.toml b/config/scenarios/Schedules Experiment/config.toml similarity index 94% rename from config/simulations/Schedules Experiment/config.toml rename to config/scenarios/Schedules Experiment/config.toml index 66bdedf..276d312 100644 --- a/config/simulations/Schedules Experiment/config.toml +++ b/config/scenarios/Schedules Experiment/config.toml @@ -1,7 +1,7 @@ # environment = "junction" environment_image = "empty" -environment = "./config/simulations/ClearCircle/environment.yaml" -formation_group = "./config/simulations/ClearCircle/formation.ron" +environment = "./config/scenarios/ClearCircle/environment.yaml" +formation_group = "./config/scenarios/ClearCircle/formation.ron" [interaction] ui-focus-cancels-inputs = true diff --git a/config/simulations/Schedules Experiment/environment.yaml b/config/scenarios/Schedules Experiment/environment.yaml similarity index 100% rename from config/simulations/Schedules Experiment/environment.yaml rename to config/scenarios/Schedules Experiment/environment.yaml diff --git a/config/simulations/Schedules Experiment/formation.yaml b/config/scenarios/Schedules Experiment/formation.yaml similarity index 100% rename from config/simulations/Schedules Experiment/formation.yaml rename to config/scenarios/Schedules Experiment/formation.yaml diff --git a/config/simulations/Screenshot/config.toml b/config/scenarios/Screenshot/config.toml similarity index 94% rename from config/simulations/Screenshot/config.toml rename to config/scenarios/Screenshot/config.toml index ff0e27e..476d9f5 100644 --- a/config/simulations/Screenshot/config.toml +++ b/config/scenarios/Screenshot/config.toml @@ -1,7 +1,7 @@ # environment = "junction" environment_image = "junction_twoway" -environment = "./config/simulations/Intersection/environment.yaml" -formation_group = "./config/simulations/Intersection/formation.ron" +environment = "./config/scenarios/Intersection/environment.yaml" +formation_group = "./config/scenarios/Intersection/formation.ron" [interaction] ui-focus-cancels-inputs = true diff --git a/config/simulations/Screenshot/environment.yaml b/config/scenarios/Screenshot/environment.yaml similarity index 100% rename from config/simulations/Screenshot/environment.yaml rename to config/scenarios/Screenshot/environment.yaml diff --git a/config/simulations/Screenshot/formation.yaml b/config/scenarios/Screenshot/formation.yaml similarity index 100% rename from config/simulations/Screenshot/formation.yaml rename to config/scenarios/Screenshot/formation.yaml diff --git a/config/simulations/Showcase/config.toml b/config/scenarios/Showcase/config.toml similarity index 95% rename from config/simulations/Showcase/config.toml rename to config/scenarios/Showcase/config.toml index 8421bc7..ee854e8 100644 --- a/config/simulations/Showcase/config.toml +++ b/config/scenarios/Showcase/config.toml @@ -1,6 +1,6 @@ environment_image = "junction_twoway" -environment = "./config/simulations/Complex/environment.yaml" -formation_group = "./config/simulations/Complex/formation.ron" +environment = "./config/scenarios/Complex/environment.yaml" +formation_group = "./config/scenarios/Complex/formation.ron" [visualisation.height] objects = 0.5 diff --git a/config/simulations/Showcase/environment.yaml b/config/scenarios/Showcase/environment.yaml similarity index 100% rename from config/simulations/Showcase/environment.yaml rename to config/scenarios/Showcase/environment.yaml diff --git a/config/simulations/Showcase/formation.yaml b/config/scenarios/Showcase/formation.yaml similarity index 100% rename from config/simulations/Showcase/formation.yaml rename to config/scenarios/Showcase/formation.yaml diff --git a/config/simulations/Solo GP/config.toml b/config/scenarios/Solo GP/config.toml similarity index 94% rename from config/simulations/Solo GP/config.toml rename to config/scenarios/Solo GP/config.toml index afc6d49..e122b65 100644 --- a/config/simulations/Solo GP/config.toml +++ b/config/scenarios/Solo GP/config.toml @@ -1,6 +1,6 @@ environment_image = "junction_twoway" -environment = "./config/simulations/Solo GP/environment.yaml" -formation_group = "./config/simulations/Solo GP/formation.ron" +environment = "./config/scenarios/Solo GP/environment.yaml" +formation_group = "./config/scenarios/Solo GP/formation.ron" [visualisation.height] objects = 0.5 diff --git a/config/simulations/Solo GP/environment.yaml b/config/scenarios/Solo GP/environment.yaml similarity index 100% rename from config/simulations/Solo GP/environment.yaml rename to config/scenarios/Solo GP/environment.yaml diff --git a/config/simulations/Solo GP/formation.yaml b/config/scenarios/Solo GP/formation.yaml similarity index 100% rename from config/simulations/Solo GP/formation.yaml rename to config/scenarios/Solo GP/formation.yaml diff --git a/config/simulations/Structured Junction Twoway/config.toml b/config/scenarios/Structured Junction Twoway/config.toml similarity index 95% rename from config/simulations/Structured Junction Twoway/config.toml rename to config/scenarios/Structured Junction Twoway/config.toml index 4e56d93..57a8470 100755 --- a/config/simulations/Structured Junction Twoway/config.toml +++ b/config/scenarios/Structured Junction Twoway/config.toml @@ -1,6 +1,6 @@ environment_image = "junction_twoway" -environment = "./config/simulations/Intersection/environment.yaml" -formation_group = "./config/simulations/Intersection/formation.ron" +environment = "./config/scenarios/Intersection/environment.yaml" +formation_group = "./config/scenarios/Intersection/formation.ron" [visualisation.height] objects = 0.5 diff --git a/config/simulations/Structured Junction Twoway/environment.yaml b/config/scenarios/Structured Junction Twoway/environment.yaml similarity index 100% rename from config/simulations/Structured Junction Twoway/environment.yaml rename to config/scenarios/Structured Junction Twoway/environment.yaml diff --git a/config/simulations/Structured Junction Twoway/formation.yaml b/config/scenarios/Structured Junction Twoway/formation.yaml similarity index 100% rename from config/simulations/Structured Junction Twoway/formation.yaml rename to config/scenarios/Structured Junction Twoway/formation.yaml diff --git a/config/simulations/Structured Junction/config.toml b/config/scenarios/Structured Junction/config.toml similarity index 95% rename from config/simulations/Structured Junction/config.toml rename to config/scenarios/Structured Junction/config.toml index f2de764..5661dbd 100644 --- a/config/simulations/Structured Junction/config.toml +++ b/config/scenarios/Structured Junction/config.toml @@ -1,6 +1,6 @@ environment_image = "junction_twoway" -environment = "./config/simulations/Intersection/environment.yaml" -formation_group = "./config/simulations/Intersection/formation.ron" +environment = "./config/scenarios/Intersection/environment.yaml" +formation_group = "./config/scenarios/Intersection/formation.ron" [visualisation.height] objects = 0.5 diff --git a/config/simulations/Structured Junction/environment.yaml b/config/scenarios/Structured Junction/environment.yaml similarity index 100% rename from config/simulations/Structured Junction/environment.yaml rename to config/scenarios/Structured Junction/environment.yaml diff --git a/config/simulations/Structured Junction/formation.yaml b/config/scenarios/Structured Junction/formation.yaml similarity index 100% rename from config/simulations/Structured Junction/formation.yaml rename to config/scenarios/Structured Junction/formation.yaml diff --git a/config/simulations/Tracking Factor Showcase/config.toml b/config/scenarios/Tracking Factor Showcase/config.toml similarity index 94% rename from config/simulations/Tracking Factor Showcase/config.toml rename to config/scenarios/Tracking Factor Showcase/config.toml index b6c993f..54427c9 100644 --- a/config/simulations/Tracking Factor Showcase/config.toml +++ b/config/scenarios/Tracking Factor Showcase/config.toml @@ -1,6 +1,6 @@ environment_image = "junction_twoway" -environment = "./config/simulations/Intersection/environment.yaml" -formation_group = "./config/simulations/Intersection/formation.ron" +environment = "./config/scenarios/Intersection/environment.yaml" +formation_group = "./config/scenarios/Intersection/formation.ron" [visualisation.height] objects = 0.5 diff --git a/config/simulations/Tracking Factor Showcase/environment.yaml b/config/scenarios/Tracking Factor Showcase/environment.yaml similarity index 100% rename from config/simulations/Tracking Factor Showcase/environment.yaml rename to config/scenarios/Tracking Factor Showcase/environment.yaml diff --git a/config/simulations/Tracking Factor Showcase/formation.yaml b/config/scenarios/Tracking Factor Showcase/formation.yaml similarity index 100% rename from config/simulations/Tracking Factor Showcase/formation.yaml rename to config/scenarios/Tracking Factor Showcase/formation.yaml diff --git a/config/simulations/Varying Network Connectivity Experiment/config.toml b/config/scenarios/Varying Network Connectivity Experiment/config.toml similarity index 94% rename from config/simulations/Varying Network Connectivity Experiment/config.toml rename to config/scenarios/Varying Network Connectivity Experiment/config.toml index d058976..2d821ba 100644 --- a/config/simulations/Varying Network Connectivity Experiment/config.toml +++ b/config/scenarios/Varying Network Connectivity Experiment/config.toml @@ -1,7 +1,7 @@ # environment = "junction" environment_image = "circle_cluttered" -environment = "./config/simulations/Circle/environment.yaml" -formation_group = "./config/simulations/Circle/formation.ron" +environment = "./config/scenarios/Circle/environment.yaml" +formation_group = "./config/scenarios/Circle/formation.ron" [interaction] ui-focus-cancels-inputs = true diff --git a/config/simulations/Varying Network Connectivity Experiment/environment.yaml b/config/scenarios/Varying Network Connectivity Experiment/environment.yaml similarity index 100% rename from config/simulations/Varying Network Connectivity Experiment/environment.yaml rename to config/scenarios/Varying Network Connectivity Experiment/environment.yaml diff --git a/config/simulations/Varying Network Connectivity Experiment/formation.yaml b/config/scenarios/Varying Network Connectivity Experiment/formation.yaml similarity index 100% rename from config/simulations/Varying Network Connectivity Experiment/formation.yaml rename to config/scenarios/Varying Network Connectivity Experiment/formation.yaml diff --git a/crates/env_to_png/src/lib.rs b/crates/env_to_png/src/lib.rs index 36b0514..c076236 100644 --- a/crates/env_to_png/src/lib.rs +++ b/crates/env_to_png/src/lib.rs @@ -312,7 +312,7 @@ fn is_placeable_obstacle( 0.0 } } - PlaceableShape::Polygon{ .. } => 0.0, + PlaceableShape::Polygon { .. } => 0.0, _ => std::f32::consts::FRAC_PI_2, }; @@ -324,8 +324,8 @@ fn is_placeable_obstacle( let inside_placeable_shape = expanded_shape.inside(rotated); // if matches!(obstacle.shape, PlaceableShape::Polygon{ .. }) { - // println!("Expanded shape: {:?}\nPoint: {:?}\nInside: {:?}", expanded_shape, translated, inside_placeable_shape); - // } + // println!("Expanded shape: {:?}\nPoint: {:?}\nInside: {:?}", + // expanded_shape, translated, inside_placeable_shape); } if inside_placeable_shape { return true; diff --git a/crates/gbp_environment/src/lib.rs b/crates/gbp_environment/src/lib.rs index a9783ff..ea17d2c 100644 --- a/crates/gbp_environment/src/lib.rs +++ b/crates/gbp_environment/src/lib.rs @@ -374,11 +374,12 @@ impl Polygon { /// Expand the polygon's size by scaling around the average pointmass by /// `expansion` as an addition pub fn expanded(&self, expansion: Float) -> Self { - let point_center = { - let acc = self.points.clone().into_iter().fold([0.0, 0.0], |acc, p| { - [acc[0] + p.x, acc[1] + p.y] - }); + let acc = self + .points + .clone() + .into_iter() + .fold([0.0, 0.0], |acc, p| [acc[0] + p.x, acc[1] + p.y]); [ acc[0] / self.points.len() as Float, @@ -408,16 +409,12 @@ impl Polygon { /// rotation to be performed beforehand pub fn inside(&self, point: Vec2) -> bool { is_point_in_polygon( - ( - point.x as f64, - point.y as f64 - ), + (point.x as f64, point.y as f64), self.points .iter() - .map(|relative_point| { - (relative_point.x, relative_point.y) - }).collect::>() - .as_slice() + .map(|relative_point| (relative_point.x, relative_point.y)) + .collect::>() + .as_slice(), ) } } diff --git a/crates/magics/src/cli.rs b/crates/magics/src/cli.rs index d725799..fabe096 100644 --- a/crates/magics/src/cli.rs +++ b/crates/magics/src/cli.rs @@ -41,9 +41,9 @@ pub struct Cli { // #[arg(short, long, value_name = "DIR")] /// Path to directory with simuliations to load. [default: - /// ./config/simulations] + /// ./config/scenarios] // #[arg(short, long, group = "configuration", default_value_t = - // String::from("./config/simulations"))] + // String::from("./config/scenarios"))] #[arg(short, long, group = "configuration")] pub simulations_dir: Option, diff --git a/crates/magics/src/main.rs b/crates/magics/src/main.rs index a526e8f..580de14 100644 --- a/crates/magics/src/main.rs +++ b/crates/magics/src/main.rs @@ -198,7 +198,7 @@ fn main() -> anyhow::Result<()> { } if cli.list_scenarios { - let scenario_dir = Path::new("./config/simulations"); + let scenario_dir = Path::new("./config/scenarios"); assert!(scenario_dir.exists()); let mut directories = Vec::new(); let entries = scenario_dir.read_dir()?; // .sort_by(|a, b| a.file_name().cmp(&b.file_name())); diff --git a/crates/magics/src/simulation_loader.rs b/crates/magics/src/simulation_loader.rs index cf080da..c017c80 100644 --- a/crates/magics/src/simulation_loader.rs +++ b/crates/magics/src/simulation_loader.rs @@ -16,7 +16,7 @@ use smol_str::SmolStr; /// Which simulation to load initially #[derive(Debug, Default)] pub enum InitialSimulation { - /// Use the first simulation found in the `config/simulations` folder + /// Use the first simulation found in the `config/scenarios` folder /// Ordered lexiographically #[default] FirstFoundInFolder, @@ -64,7 +64,7 @@ pub struct Raw(pub RawImage); // struct Simulations(BTreeMap); type Simulations = BTreeMap; -const SIMULATIONS_DIR: &'static str = "./config/simulations"; +const SIMULATIONS_DIR: &'static str = "./config/scenarios"; impl SimulationLoaderPlugin { pub fn new(show_toasts: bool, initial_simulation: Option) -> Self { diff --git a/scripts/run-circle-expertiment.fish b/scripts/run-circle-expertiment.fish index 66e0083..b4988f0 100755 --- a/scripts/run-circle-expertiment.fish +++ b/scripts/run-circle-expertiment.fish @@ -8,8 +8,8 @@ function run eval $argv end -set -l config_file config/simulations/Circle\ Experiment/config.toml -set -l formation_file config/simulations/Circle\ Experiment/formation.yaml +set -l config_file config/scenarios/Circle\ Experiment/config.toml +set -l formation_file config/scenarios/Circle\ Experiment/formation.yaml if not test -f $config_file printf '%serror%s: %s does not exist!\n' (set_color red) (set_color normal) $config_file >&2 diff --git a/scripts/run-collaborative-complex-experiment.fish b/scripts/run-collaborative-complex-experiment.fish index d5960ed..7809d1c 100755 --- a/scripts/run-collaborative-complex-experiment.fish +++ b/scripts/run-collaborative-complex-experiment.fish @@ -20,7 +20,7 @@ end set -l scenario 'Collaborative Complex' -set -l config_file config/simulations/$scenario/config.toml +set -l config_file config/scenarios/$scenario/config.toml if not test -f $config_file printf '%serror%s: %s does not exist!\n' $red $reset $config_file >&2 diff --git a/scripts/run-collaborative-gp-experiment.fish b/scripts/run-collaborative-gp-experiment.fish index e4cca1c..6f05bcb 100755 --- a/scripts/run-collaborative-gp-experiment.fish +++ b/scripts/run-collaborative-gp-experiment.fish @@ -13,8 +13,8 @@ set -l seeds 0 31 227 252 805 # --- Low Qin --- set -l experiment "Collaborative GP" -set -l config_file "config/simulations/$experiment/config.toml" -set -l formation_file "config/simulations/$experiment/formation.yaml" +set -l config_file "config/scenarios/$experiment/config.toml" +set -l formation_file "config/scenarios/$experiment/formation.yaml" if not test -f $config_file printf '%serror%s: %s does not exist!\n' (set_color red) (set_color normal) $config_file >&2 diff --git a/scripts/run-communication-failure-expertiment.fish b/scripts/run-communication-failure-expertiment.fish index eb66130..566e948 100755 --- a/scripts/run-communication-failure-expertiment.fish +++ b/scripts/run-communication-failure-expertiment.fish @@ -18,7 +18,7 @@ function run eval $argv end -set -l config_file config/simulations/Communications\ Failure\ Experiment/config.toml +set -l config_file config/scenarios/Communications\ Failure\ Experiment/config.toml if not test -f $config_file printf '%serror%s: %s does not exist!\n' (set_color red) (set_color normal) $config_file >&2 diff --git a/scripts/run-environment-obstacles-experiment.fish b/scripts/run-environment-obstacles-experiment.fish index 9637772..58f800b 100755 --- a/scripts/run-environment-obstacles-experiment.fish +++ b/scripts/run-environment-obstacles-experiment.fish @@ -13,8 +13,8 @@ set -l blue (set_color blue) set -l cyan (set_color cyan) set -l magenta (set_color magenta) -set -l config_file config/simulations/Environment\ Obstacles\ Experiment/config.toml -set -l formation_file config/simulations/Environment\ Obstacles\ Experiment/formation.yaml +set -l config_file config/scenarios/Environment\ Obstacles\ Experiment/config.toml +set -l formation_file config/scenarios/Environment\ Obstacles\ Experiment/formation.yaml if not test -f $config_file printf '%serror%s: %s does not exist!\n' $red $reset $config_file >&2 diff --git a/scripts/run-iteration-amount-experiment.fish b/scripts/run-iteration-amount-experiment.fish index a0be6b9..2e644a9 100755 --- a/scripts/run-iteration-amount-experiment.fish +++ b/scripts/run-iteration-amount-experiment.fish @@ -8,7 +8,7 @@ function run eval $argv end -set -l config_file config/simulations/Iteration\ Amount\ Experiment/config.toml +set -l config_file config/scenarios/Iteration\ Amount\ Experiment/config.toml if not test -f $config_file printf '%serror%s: %s does not exist!\n' (set_color red) (set_color normal) $config_file >&2 diff --git a/scripts/run-schedules-experiment.fish b/scripts/run-schedules-experiment.fish index 8d0ab64..8760ef9 100755 --- a/scripts/run-schedules-experiment.fish +++ b/scripts/run-schedules-experiment.fish @@ -10,7 +10,7 @@ end set -l experiment "Schedules Experiment" -set -l config_file "config/simulations/$experiment/config.toml" +set -l config_file "config/scenarios/$experiment/config.toml" if not test -f $config_file printf '%serror%s: %s does not exist!\n' (set_color red) (set_color normal) $config_file >&2 diff --git a/scripts/run-solo-gp-experiment.fish b/scripts/run-solo-gp-experiment.fish index 17815a2..d535612 100755 --- a/scripts/run-solo-gp-experiment.fish +++ b/scripts/run-solo-gp-experiment.fish @@ -9,7 +9,7 @@ function run end set -l experiment "Solo GP" -set -l config_file "config/simulations/$experiment/config.toml" +set -l config_file "config/scenarios/$experiment/config.toml" if not test -f $config_file printf '%serror%s: %s does not exist!\n' (set_color red) (set_color normal) $config_file >&2 diff --git a/scripts/run-structured-junction-twoway.fish b/scripts/run-structured-junction-twoway.fish index 4858342..818343f 100755 --- a/scripts/run-structured-junction-twoway.fish +++ b/scripts/run-structured-junction-twoway.fish @@ -18,7 +18,7 @@ function run eval $argv end -set -l config_file config/simulations/Structured\ Junction\ Twoway/config.toml +set -l config_file config/scenarios/Structured\ Junction\ Twoway/config.toml if not test -f $config_file printf '%serror%s: %s does not exist!\n' (set_color red) (set_color normal) $config_file >&2 diff --git a/scripts/run-varying-network-connectivity-experiment.fish b/scripts/run-varying-network-connectivity-experiment.fish index 0a35127..c2428e7 100755 --- a/scripts/run-varying-network-connectivity-experiment.fish +++ b/scripts/run-varying-network-connectivity-experiment.fish @@ -15,8 +15,8 @@ set -l magenta (set_color magenta) #'Varying Network Connectivity Experiment' -set -l config_file config/simulations/Varying\ Network\ Connectivity\ Experiment/config.toml -set -l formation_file config/simulations/Varying\ Network\ Connectivity\ Experiment/formation.yaml +set -l config_file config/scenarios/Varying\ Network\ Connectivity\ Experiment/config.toml +set -l formation_file config/scenarios/Varying\ Network\ Connectivity\ Experiment/formation.yaml if not test -f $config_file printf '%serror%s: %s does not exist!\n' $red $reset $config_file >&2