chore: rename config/simulations config/scenarios

AU-Master-Thesis · Sep 6, 2024 · 6ea2372 · 6ea2372
1 parent 27eff37
commit 6ea2372
Show file tree

Hide file tree

Showing 69 changed files with 70 additions and 73 deletions.
diff --git a/...simulations/Circle Experiment/config.toml → ...g/scenarios/Circle Experiment/config.toml b/...simulations/Circle Experiment/config.toml → ...g/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/...ations/Circle Experiment/environment.yaml → ...narios/Circle Experiment/environment.yaml b/...ations/Circle Experiment/environment.yaml → ...narios/Circle Experiment/environment.yaml
diff --git a/...ulations/Circle Experiment/formation.yaml → ...cenarios/Circle Experiment/formation.yaml b/...ulations/Circle Experiment/formation.yaml → ...cenarios/Circle Experiment/formation.yaml
diff --git a/...lations/Collaborative Complex/config.toml → ...enarios/Collaborative Complex/config.toml b/...lations/Collaborative Complex/config.toml → ...enarios/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/...ns/Collaborative Complex/environment.yaml → ...os/Collaborative Complex/environment.yaml b/...ns/Collaborative Complex/environment.yaml → ...os/Collaborative Complex/environment.yaml
diff --git a/...ions/Collaborative Complex/formation.yaml → ...rios/Collaborative Complex/formation.yaml b/...ions/Collaborative Complex/formation.yaml → ...rios/Collaborative Complex/formation.yaml
diff --git a/.../simulations/Collaborative GP/config.toml → ...ig/scenarios/Collaborative GP/config.toml b/.../simulations/Collaborative GP/config.toml → ...ig/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/...lations/Collaborative GP/environment.yaml → ...enarios/Collaborative GP/environment.yaml b/...lations/Collaborative GP/environment.yaml → ...enarios/Collaborative GP/environment.yaml
diff --git a/...mulations/Collaborative GP/formation.yaml → ...scenarios/Collaborative GP/formation.yaml b/...mulations/Collaborative GP/formation.yaml → ...scenarios/Collaborative GP/formation.yaml
diff --git a/...unications Failure Experiment/config.toml → ...unications Failure Experiment/config.toml b/...unications Failure Experiment/config.toml → ...unications 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/...tions Failure Experiment/environment.yaml → ...tions Failure Experiment/environment.yaml b/...tions Failure Experiment/environment.yaml → ...tions Failure Experiment/environment.yaml
diff --git a/...cations Failure Experiment/formation.yaml → ...cations Failure Experiment/formation.yaml b/...cations Failure Experiment/formation.yaml → ...cations Failure Experiment/formation.yaml
diff --git a/...ironment Obstacles Experiment/config.toml → ...ironment Obstacles Experiment/config.toml b/...ironment Obstacles Experiment/config.toml → ...ironment 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/...ent Obstacles Experiment/environment.yaml → ...ent Obstacles Experiment/environment.yaml b/...ent Obstacles Experiment/environment.yaml → ...ent Obstacles Experiment/environment.yaml
diff --git a/...nment Obstacles Experiment/formation.yaml → ...nment Obstacles Experiment/formation.yaml b/...nment Obstacles Experiment/formation.yaml → ...nment Obstacles Experiment/formation.yaml
diff --git a/...s/Iteration Amount Experiment/config.toml → ...s/Iteration Amount Experiment/config.toml b/...s/Iteration Amount Experiment/config.toml → ...s/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/...ration Amount Experiment/environment.yaml → ...ration Amount Experiment/environment.yaml b/...ration Amount Experiment/environment.yaml → ...ration Amount Experiment/environment.yaml
diff --git a/...teration Amount Experiment/formation.yaml → ...teration Amount Experiment/formation.yaml b/...teration Amount Experiment/formation.yaml → ...teration Amount Experiment/formation.yaml
diff --git a/...mulations/Junction Experiment/config.toml → ...scenarios/Junction Experiment/config.toml b/...mulations/Junction Experiment/config.toml → ...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/...ions/Junction Experiment/environment.yaml → ...rios/Junction Experiment/environment.yaml b/...ions/Junction Experiment/environment.yaml → ...rios/Junction Experiment/environment.yaml
diff --git a/...ations/Junction Experiment/formation.yaml → ...narios/Junction Experiment/formation.yaml b/...ations/Junction Experiment/formation.yaml → ...narios/Junction Experiment/formation.yaml
diff --git a/...g/simulations/Junction Twoway/config.toml → config/scenarios/Junction Twoway/config.toml b/...g/simulations/Junction Twoway/config.toml → 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/...ulations/Junction Twoway/environment.yaml → ...cenarios/Junction Twoway/environment.yaml b/...ulations/Junction Twoway/environment.yaml → ...cenarios/Junction Twoway/environment.yaml
diff --git a/...imulations/Junction Twoway/formation.yaml → .../scenarios/Junction Twoway/formation.yaml b/...imulations/Junction Twoway/formation.yaml → .../scenarios/Junction Twoway/formation.yaml
diff --git a/config/simulations/Merge/config.toml → config/scenarios/Merge/config.toml b/config/simulations/Merge/config.toml → 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 → config/scenarios/Merge/environment.yaml b/config/simulations/Merge/environment.yaml → 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
+    col: 3
diff --git a/config/simulations/Merge/formation.yaml → config/scenarios/Merge/formation.yaml b/config/simulations/Merge/formation.yaml → config/scenarios/Merge/formation.yaml
@@ -105,4 +105,4 @@ formations:
     intersects-with: horizon
   finished-when-intersects:
     distance: !meter 40
-    intersects-with: current
+    intersects-with: current
diff --git a/...ions/Obstacle Shapes Showcase/config.toml → ...rios/Obstacle Shapes Showcase/config.toml b/...ions/Obstacle Shapes Showcase/config.toml → ...rios/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/...Obstacle Shapes Showcase/environment.yaml → ...Obstacle Shapes Showcase/environment.yaml b/...Obstacle Shapes Showcase/environment.yaml → ...Obstacle Shapes Showcase/environment.yaml
diff --git a/...s/Obstacle Shapes Showcase/formation.yaml → ...s/Obstacle Shapes Showcase/formation.yaml b/...s/Obstacle Shapes Showcase/formation.yaml → ...s/Obstacle Shapes Showcase/formation.yaml
diff --git a/...ulations/Schedules Experiment/config.toml → ...cenarios/Schedules Experiment/config.toml b/...ulations/Schedules Experiment/config.toml → ...cenarios/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/...ons/Schedules Experiment/environment.yaml → ...ios/Schedules Experiment/environment.yaml b/...ons/Schedules Experiment/environment.yaml → ...ios/Schedules Experiment/environment.yaml
diff --git a/...tions/Schedules Experiment/formation.yaml → ...arios/Schedules Experiment/formation.yaml b/...tions/Schedules Experiment/formation.yaml → ...arios/Schedules Experiment/formation.yaml
diff --git a/config/simulations/Screenshot/config.toml → config/scenarios/Screenshot/config.toml b/config/simulations/Screenshot/config.toml → 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/...g/simulations/Screenshot/environment.yaml → config/scenarios/Screenshot/environment.yaml b/...g/simulations/Screenshot/environment.yaml → config/scenarios/Screenshot/environment.yaml
diff --git a/config/simulations/Screenshot/formation.yaml → config/scenarios/Screenshot/formation.yaml b/config/simulations/Screenshot/formation.yaml → config/scenarios/Screenshot/formation.yaml
diff --git a/config/simulations/Showcase/config.toml → config/scenarios/Showcase/config.toml b/config/simulations/Showcase/config.toml → 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 → config/scenarios/Showcase/environment.yaml b/config/simulations/Showcase/environment.yaml → config/scenarios/Showcase/environment.yaml
diff --git a/config/simulations/Showcase/formation.yaml → config/scenarios/Showcase/formation.yaml b/config/simulations/Showcase/formation.yaml → config/scenarios/Showcase/formation.yaml
diff --git a/config/simulations/Solo GP/config.toml → config/scenarios/Solo GP/config.toml b/config/simulations/Solo GP/config.toml → 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 → config/scenarios/Solo GP/environment.yaml b/config/simulations/Solo GP/environment.yaml → config/scenarios/Solo GP/environment.yaml
diff --git a/config/simulations/Solo GP/formation.yaml → config/scenarios/Solo GP/formation.yaml b/config/simulations/Solo GP/formation.yaml → config/scenarios/Solo GP/formation.yaml
diff --git a/...ns/Structured Junction Twoway/config.toml → ...os/Structured Junction Twoway/config.toml b/...ns/Structured Junction Twoway/config.toml → ...os/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/...ructured Junction Twoway/environment.yaml → ...ructured Junction Twoway/environment.yaml b/...ructured Junction Twoway/environment.yaml → ...ructured Junction Twoway/environment.yaml
diff --git a/...Structured Junction Twoway/formation.yaml → ...Structured Junction Twoway/formation.yaml b/...Structured Junction Twoway/formation.yaml → ...Structured Junction Twoway/formation.yaml
diff --git a/...mulations/Structured Junction/config.toml → ...scenarios/Structured Junction/config.toml b/...mulations/Structured Junction/config.toml → ...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/...ions/Structured Junction/environment.yaml → ...rios/Structured Junction/environment.yaml b/...ions/Structured Junction/environment.yaml → ...rios/Structured Junction/environment.yaml
diff --git a/...ations/Structured Junction/formation.yaml → ...narios/Structured Junction/formation.yaml b/...ations/Structured Junction/formation.yaml → ...narios/Structured Junction/formation.yaml
diff --git a/...ions/Tracking Factor Showcase/config.toml → ...rios/Tracking Factor Showcase/config.toml b/...ions/Tracking Factor Showcase/config.toml → ...rios/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/...Tracking Factor Showcase/environment.yaml → ...Tracking Factor Showcase/environment.yaml b/...Tracking Factor Showcase/environment.yaml → ...Tracking Factor Showcase/environment.yaml
diff --git a/...s/Tracking Factor Showcase/formation.yaml → ...s/Tracking Factor Showcase/formation.yaml b/...s/Tracking Factor Showcase/formation.yaml → ...s/Tracking Factor Showcase/formation.yaml
diff --git a/...twork Connectivity Experiment/config.toml → ...twork Connectivity Experiment/config.toml b/...twork Connectivity Experiment/config.toml → ...twork 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/... Connectivity Experiment/environment.yaml → ... Connectivity Experiment/environment.yaml b/... Connectivity Experiment/environment.yaml → ... Connectivity Experiment/environment.yaml
diff --git a/...rk Connectivity Experiment/formation.yaml → ...rk Connectivity Experiment/formation.yaml b/...rk Connectivity Experiment/formation.yaml → ...rk Connectivity Experiment/formation.yaml
diff --git 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
@@ -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::<Vec<_>>()
-                .as_slice()
+                .map(|relative_point| (relative_point.x, relative_point.y))
+                .collect::<Vec<_>>()
+                .as_slice(),
         )
     }
 }

diff --git 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<std::path::PathBuf>,
 

diff --git 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
@@ -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<String, Simulation>);
 type Simulations = BTreeMap<String, Simulation>;
 
-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<String>) -> Self {

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -185,7 +185,7 @@ obstacles: @@
       tile-coordinates:
         row: 2
         col: 3
     - shape: !polygon
         points:
         - x: 0.0
@@ Expand Down Expand Up / @@ -336,4 +336,4 @@ obstacles: @@
         y: 0.0
       tile-coordinates:
         row: 1
-        col: 3
+        col: 3