diff --git a/.vscode/settings.json b/.vscode/settings.json index 23fd35f..e69de29 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +0,0 @@ -{ - "editor.formatOnSave": true -} \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index dcdd1be..3f4e5ec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -50,7 +50,7 @@ dependencies = [ "criterion", "csv", "gnuplot", - "hashbrown", + "hashbrown 0.12.1", "multimap", "nalgebra", "rand", @@ -308,6 +308,15 @@ name = "hashbrown" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3" dependencies = [ "ahash", "rayon", @@ -339,7 +348,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.11.2", ] [[package]] @@ -440,9 +449,9 @@ dependencies = [ [[package]] name = "nalgebra" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d506eb7e08d6329505faa8a3a00a5dcc6de9f76e0c77e4b75763ae3c770831ff" +checksum = "18a89248335f688e4bd994e6d030fd7e185eb41769b8c435395075425e100ac6" dependencies = [ "approx", "matrixmultiply", @@ -813,7 +822,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb0210289d693217926314867c807e0b7b42f7e23c136adb31f8697f5bf242d3" dependencies = [ "arrayvec", - "hashbrown", + "hashbrown 0.11.2", "mopa", "rayon", "smallvec", @@ -828,9 +837,9 @@ checksum = "b5752e017e03af9d735b4b069f53b7a7fd90fefafa04d8bd0c25581b0bff437f" [[package]] name = "simba" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b7840f121a46d63066ee7a99fc81dcabbc6105e437cae43528cea199b5a05f" +checksum = "13a2609e876d4f77f6ab7ff5254fc39b4f1927ba8e6db3d18be7c32534d3725e" dependencies = [ "approx", "num-complex", @@ -852,7 +861,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dcc1e4ba7ab1f08ecb3d7e2f693defc3907e2c03bb0924f9978be45b364f83f" dependencies = [ "crossbeam-queue", - "hashbrown", + "hashbrown 0.11.2", "hibitset", "log", "rayon", diff --git a/Cargo.toml b/Cargo.toml index 3352050..69e16ef 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,11 +21,11 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" serde_yaml = "0.8.9" assert_approx_eq = "1.1.0" -nalgebra = { version = "0.29.0", features = ["serde-serialize"] } +nalgebra = { version = "^0.31.0", features = ["serde-serialize"] } csv = "1.1" byteorder = "1.3.2" multimap = "0.8.2" -hashbrown = { version = "0.11.2", features = ["rayon"] } +hashbrown = { version = "^0.12.1", features = ["rayon"] } serde_arrays = "0.1.0" [dev-dependencies] diff --git a/src/atom_sources/oven.rs b/src/atom_sources/oven.rs index 54f235b..29bd003 100644 --- a/src/atom_sources/oven.rs +++ b/src/atom_sources/oven.rs @@ -209,13 +209,13 @@ impl<'a, T> System<'a> for OvenCreateAtomsSystem where T : AtomCreator + 'sta continue; } - let new_atom = entities.create(); let (new_vel, theta) = velocity_generate(speed, &oven.direction, &oven.theta_distribution); - + if theta > oven.max_theta { continue; } + let new_atom = entities.create(); let start_position = oven_position.pos + oven.get_random_spawn_position(); updater.insert( new_atom,