Bump krABMaga to 0.5.0 (#28)

* feat: bump krABMaga to 0.5.0 with the required changes for state rendering systems * refactor: rustfmt * fix: move visualization imports in the proper cfg scope
krABMaga · Mar 4, 2024 · 6881edc · 6881edc
1 parent 5f67039
commit 6881edc
Show file tree

Hide file tree

Showing 20 changed files with 85 additions and 82 deletions.
diff --git a/antsforaging/Cargo.toml b/antsforaging/Cargo.toml
@@ -18,7 +18,7 @@ readme = "README.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-krabmaga = "0.4.*"
+krabmaga = "0.5.*"
 
 [features]
 visualization = ["krabmaga/visualization"]

diff --git a/antsforaging/src/main.rs b/antsforaging/src/main.rs
@@ -1,3 +1,15 @@
+#[cfg(not(any(feature = "visualization", feature = "visualization_wasm")))]
+use krabmaga::simulate;
+
+// Visualization specific imports
+#[cfg(any(feature = "visualization", feature = "visualization_wasm"))]
+use {
+    crate::model::to_food_grid::ToFoodGrid, crate::model::to_home_grid::ToHomeGrid,
+    crate::visualization::vis_state::VisState, krabmaga::bevy::app::FixedUpdate,
+    krabmaga::bevy::prelude::Color, krabmaga::visualization::fields::number_grid_2d::BatchRender,
+    krabmaga::visualization::visualization::Visualization,
+};
+
 // Global imports, required in all cases
 use crate::model::state::ModelState;
 
@@ -28,18 +40,6 @@ pub const MOMENTUM_PROBABILITY: f64 = 0.8;
 pub const RANDOM_ACTION_PROBABILITY: f64 = 0.1;
 pub const UPDATE_CUTDOWN: f32 = 0.9;
 
-// Visualization specific imports
-#[cfg(any(feature = "visualization", feature = "visualization_wasm"))]
-use {
-    crate::model::to_food_grid::ToFoodGrid, crate::model::to_home_grid::ToHomeGrid,
-    crate::visualization::vis_state::VisState, krabmaga::bevy::prelude::Color,
-    krabmaga::visualization::fields::number_grid_2d::BatchRender,
-    krabmaga::visualization::visualization::Visualization,
-};
-
-#[cfg(not(any(feature = "visualization", feature = "visualization_wasm")))]
-use krabmaga::simulate;
-
 #[cfg(any(feature = "visualization", feature = "visualization_wasm"))]
 pub mod visualization;
 
@@ -53,8 +53,10 @@ fn main() {
         .with_window_dimensions(1280., 720.)
         .with_name("Ants foraging")
         .setup::<VisState, ModelState>(VisState, state);
-    app.add_system(ToHomeGrid::batch_render)
-        .add_system(ToFoodGrid::batch_render);
+    app.add_systems(
+        FixedUpdate,
+        (ToHomeGrid::batch_render, ToFoodGrid::batch_render),
+    );
     app.run()
 }
 

diff --git a/flockers/Cargo.toml b/flockers/Cargo.toml
@@ -18,7 +18,7 @@ readme = "README.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-krabmaga = "0.4.*"
+krabmaga = "0.5.*"
 
 [features]
 parallel = ["krabmaga/parallel"]

diff --git a/flockers/src/main.rs b/flockers/src/main.rs
@@ -1,21 +1,20 @@
-use crate::model::state::Flocker;
-
-mod model;
-
 // No visualization specific imports
 #[cfg(not(any(feature = "visualization", feature = "visualization_wasm")))]
 use {
     krabmaga::engine::schedule::Schedule, krabmaga::engine::state::State, krabmaga::Info,
     krabmaga::*, std::time::Duration,
 };
-
 // Visualization specific imports
 #[cfg(any(feature = "visualization", feature = "visualization_wasm"))]
 use {
     crate::visualization::vis_state::VisState, krabmaga::bevy::prelude::Color,
     krabmaga::visualization::visualization::Visualization,
 };
 
+use crate::model::state::Flocker;
+
+mod model;
+
 #[cfg(any(feature = "visualization", feature = "visualization_wasm"))]
 mod visualization;
 

diff --git a/flockers_mpi/Cargo.toml b/flockers_mpi/Cargo.toml
@@ -18,7 +18,7 @@ readme = "README.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-krabmaga = "0.4.*"
+krabmaga = "0.5.*"
 
 [features]
 distributed_mpi = ["krabmaga/distributed_mpi"]

diff --git a/flockers_mpi/src/main.rs b/flockers_mpi/src/main.rs
@@ -1,5 +1,6 @@
 use cfg_if::cfg_if;
 use krabmaga::cfg_if;
+
 cfg_if! {
     if #[cfg(any(feature = "distributed_mpi"))]
     {

diff --git a/forestfire/Cargo.toml b/forestfire/Cargo.toml
@@ -18,7 +18,7 @@ readme = "README.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-krabmaga = "0.4.*"
+krabmaga = "0.5.*"
 
 [features]
 visualization = ["krabmaga/visualization"]

diff --git a/forestfire/src/main.rs b/forestfire/src/main.rs
@@ -1,21 +1,21 @@
-// Global imports (needed for the simulation to run)
-use crate::model::forest::Forest;
-use crate::model::forest::Tree;
-
-mod model;
-
 #[cfg(not(any(feature = "visualization", feature = "visualization_wasm")))]
 use krabmaga::simulate;
 
 // Visualization specific imports
 #[cfg(any(feature = "visualization", feature = "visualization_wasm"))]
 use {
-    crate::visualization::forest_vis::ForestVis, krabmaga::bevy::prelude::Color,
-    krabmaga::engine::fields::dense_object_grid_2d::DenseGrid2D,
+    crate::visualization::forest_vis::ForestVis, krabmaga::bevy::app::FixedUpdate,
+    krabmaga::bevy::prelude::Color, krabmaga::engine::fields::dense_object_grid_2d::DenseGrid2D,
     krabmaga::visualization::fields::object_grid_2d::RenderObjectGrid2D,
     krabmaga::visualization::visualization::Visualization,
 };
 
+// Global imports (needed for the simulation to run)
+use crate::model::forest::Forest;
+use crate::model::forest::Tree;
+
+mod model;
+
 /* pub static STEP: u64 = 10;
 pub static WIDTH: i32 = 6400;
 pub static HEIGHT: i32 = 6400;
@@ -48,6 +48,6 @@ fn main() {
         .with_background_color(Color::BLACK)
         .with_name("Forest Fire Model")
         .setup::<ForestVis, Forest>(ForestVis, state);
-    app.add_system(DenseGrid2D::<Tree>::render);
+    app.add_systems(FixedUpdate, DenseGrid2D::<Tree>::render);
     app.run();
 }
diff --git a/forestfire_bayesian/Cargo.toml b/forestfire_bayesian/Cargo.toml
@@ -18,7 +18,7 @@ readme = "README.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-krabmaga = "0.4.*"
+krabmaga = "0.5.*"
 
 [features]
 bayesian = ["krabmaga/bayesian"]
diff --git a/forestfire_bayesian/src/main.rs b/forestfire_bayesian/src/main.rs
@@ -1,14 +1,13 @@
+#[cfg(any(feature = "bayesian"))]
+use krabmaga::{engine::schedule::Schedule, engine::state::State, explore::bayesian::*};
+use krabmaga::{rand::prelude::*, *};
+
 // Global imports (needed for the simulation to run)
 use crate::model::forest::Forest;
 use crate::model::forest::Tree;
 
 mod model;
 
-#[cfg(any(feature = "bayesian"))]
-use krabmaga::{engine::schedule::Schedule, engine::state::State, explore::bayesian::*};
-
-use krabmaga::{rand::prelude::*, *};
-
 pub const ITERATIONS: usize = 10;
 pub const INIT_ELEMENTS: usize = 4;
 pub const BATCH_SIZE: usize = 200;

diff --git a/schelling/Cargo.toml b/schelling/Cargo.toml
@@ -18,7 +18,7 @@ readme = "README.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-krabmaga = "0.4.*"
+krabmaga = "0.5.*"
 
 [features]
 visualization = ["krabmaga/visualization"]

diff --git a/schelling/src/main.rs b/schelling/src/main.rs
@@ -1,20 +1,21 @@
-// Global imports (needed for the simulation to run)
-use crate::model::world::Patch;
-use crate::model::world::World;
-mod model;
-
 #[cfg(not(any(feature = "visualization", feature = "visualization_wasm")))]
 use krabmaga::*;
 
 // Visualization specific imports
 #[cfg(any(feature = "visualization", feature = "visualization_wasm"))]
 use {
-    crate::visualization::world_vis::WorldVis, krabmaga::bevy::prelude::Color,
-    krabmaga::engine::fields::sparse_object_grid_2d::SparseGrid2D,
+    crate::visualization::world_vis::WorldVis, krabmaga::bevy::app::FixedUpdate,
+    krabmaga::bevy::prelude::Color, krabmaga::engine::fields::sparse_object_grid_2d::SparseGrid2D,
     krabmaga::visualization::fields::object_grid_2d::RenderObjectGrid2D,
     krabmaga::visualization::visualization::Visualization,
 };
 
+// Global imports (needed for the simulation to run)
+use crate::model::world::Patch;
+use crate::model::world::World;
+
+mod model;
+
 pub const PERC: f32 = 0.5;
 pub const SIMILAR_WANTED: u32 = 3;
 
@@ -51,6 +52,6 @@ fn main() {
         .with_background_color(Color::WHITE)
         .with_name("Schelling Model")
         .setup::<WorldVis, World>(WorldVis, world);
-    app.add_system(SparseGrid2D::<Patch>::render);
+    app.add_systems(FixedUpdate, SparseGrid2D::<Patch>::render);
     app.run();
 }
diff --git a/sugarscape/Cargo.toml b/sugarscape/Cargo.toml
@@ -18,7 +18,7 @@ readme = "README.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-krabmaga = "0.4.*"
+krabmaga = "0.5.*"
 
 [features]
 visualization = ["krabmaga/visualization"]

diff --git a/sugarscape/src/main.rs b/sugarscape/src/main.rs
@@ -1,21 +1,21 @@
-mod model;
-use crate::model::state::Environment;
 use krabmaga::*;
 
-#[cfg(any(feature = "visualization", feature = "visualization_wasm"))]
-mod visualization;
-
-#[cfg(any(feature = "visualization", feature = "visualization_wasm"))]
-use crate::visualization::environment_vis::EnvironmentVis;
-
 #[cfg(any(feature = "visualization", feature = "visualization_wasm"))]
 use {
-    krabmaga::bevy::prelude::Color,
+    krabmaga::bevy::prelude::Color, krabmaga::bevy::prelude::FixedUpdate,
     krabmaga::engine::fields::dense_number_grid_2d::DenseNumberGrid2D,
     krabmaga::visualization::fields::number_grid_2d::BatchRender,
     krabmaga::visualization::visualization::Visualization,
 };
 
+use crate::model::state::Environment;
+#[cfg(any(feature = "visualization", feature = "visualization_wasm"))]
+use crate::visualization::environment_vis::EnvironmentVis;
+
+mod model;
+#[cfg(any(feature = "visualization", feature = "visualization_wasm"))]
+mod visualization;
+
 pub const MAX_SUGAR: u32 = 3;
 
 #[cfg(not(any(feature = "visualization", feature = "visualization_wasm")))]
@@ -41,6 +41,6 @@ fn main() {
         .with_background_color(Color::WHITE)
         .with_name("Sugarscape")
         .setup::<EnvironmentVis, Environment>(EnvironmentVis, state);
-    app.add_system(DenseNumberGrid2D::batch_render);
+    app.add_systems(FixedUpdate, DenseNumberGrid2D::batch_render);
     app.run()
 }
diff --git a/template/Cargo.toml b/template/Cargo.toml
@@ -18,7 +18,7 @@ readme = "README.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-krabmaga = "0.4.*"
+krabmaga = "0.5.*"
 
 [features]
 visualization = ["krabmaga/visualization"]

diff --git a/template/src/main.rs b/template/src/main.rs
@@ -1,7 +1,3 @@
-// Global imports (needed for the simulation to run)
-use crate::model::sea::Sea;
-mod model;
-
 #[cfg(not(any(feature = "visualization", feature = "visualization_wasm")))]
 use krabmaga::*;
 
@@ -12,6 +8,11 @@ use {
     krabmaga::visualization::visualization::Visualization,
 };
 
+// Global imports (needed for the simulation to run)
+use crate::model::sea::Sea;
+
+mod model;
+
 #[cfg(any(feature = "visualization", feature = "visualization_wasm"))]
 mod visualization;
 

diff --git a/virusnetwork/Cargo.toml b/virusnetwork/Cargo.toml
@@ -18,7 +18,7 @@ readme = "README.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-krabmaga = "0.4.*"
+krabmaga = "0.5.*"
 
 [features]
 visualization = ["krabmaga/visualization"]

diff --git a/virusnetwork/src/main.rs b/virusnetwork/src/main.rs
@@ -3,15 +3,14 @@ extern crate krabmaga;
 #[cfg(not(any(feature = "visualization", feature = "visualization_wasm")))]
 use krabmaga::*;
 
-// Visualization specific imports
+use model::state::EpidemicNetworkState;
 #[cfg(any(feature = "visualization", feature = "visualization_wasm"))]
 use {
     crate::visualization::vis_state::VisState, krabmaga::bevy::prelude::Color,
-    krabmaga::visualization::fields::network::NetworkRender,
+    krabmaga::bevy::prelude::FixedUpdate, krabmaga::visualization::fields::network::NetworkRender,
     krabmaga::visualization::visualization::Visualization,
 };
 
-use model::state::EpidemicNetworkState;
 mod model;
 
 static DISCRETIZATION: f32 = 10.0 / 1.5;
@@ -50,6 +49,6 @@ fn main() {
         .with_simulation_dimensions(dim.0, dim.1)
         .with_background_color(Color::rgb(255., 255., 255.))
         .setup::<VisState, EpidemicNetworkState>(VisState, epidemic_network);
-    app.add_system(EpidemicNetworkState::render);
+    app.add_systems(FixedUpdate, EpidemicNetworkState::render);
     app.run();
 }
diff --git a/wolfsheepgrass/Cargo.toml b/wolfsheepgrass/Cargo.toml
@@ -18,7 +18,7 @@ readme = "README.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-krabmaga = "0.4.*"
+krabmaga = "0.5.*"
 
 [features]
 visualization = ["krabmaga/visualization"]