forked from Maxluli/RustyPropagation
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| bc13c48302 | |||
| ced3a93412 | |||
| 3fe4ddc2ee |
227
Cargo.lock
generated
227
Cargo.lock
generated
@@ -2,74 +2,12 @@
|
|||||||
# It is not intended for manual editing.
|
# It is not intended for manual editing.
|
||||||
version = 3
|
version = 3
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "atty"
|
|
||||||
version = "0.2.14"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
|
|
||||||
dependencies = [
|
|
||||||
"hermit-abi",
|
|
||||||
"libc",
|
|
||||||
"winapi",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "autocfg"
|
|
||||||
version = "1.1.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "bitflags"
|
|
||||||
version = "1.3.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cfg-if"
|
name = "cfg-if"
|
||||||
version = "1.0.0"
|
version = "1.0.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "clap"
|
|
||||||
version = "3.1.15"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "85a35a599b11c089a7f49105658d089b8f2cf0882993c17daf6de15285c2c35d"
|
|
||||||
dependencies = [
|
|
||||||
"atty",
|
|
||||||
"bitflags",
|
|
||||||
"clap_derive",
|
|
||||||
"clap_lex",
|
|
||||||
"indexmap",
|
|
||||||
"lazy_static",
|
|
||||||
"strsim",
|
|
||||||
"termcolor",
|
|
||||||
"textwrap",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "clap_derive"
|
|
||||||
version = "3.1.7"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1"
|
|
||||||
dependencies = [
|
|
||||||
"heck",
|
|
||||||
"proc-macro-error",
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "clap_lex"
|
|
||||||
version = "0.2.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "a37c35f1112dad5e6e0b1adaff798507497a18fceeb30cceb3bae7d1427b9213"
|
|
||||||
dependencies = [
|
|
||||||
"os_str_bytes",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "console"
|
name = "console"
|
||||||
version = "0.15.0"
|
version = "0.15.0"
|
||||||
@@ -102,48 +40,11 @@ dependencies = [
|
|||||||
"wasi",
|
"wasi",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "hashbrown"
|
|
||||||
version = "0.9.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "heck"
|
|
||||||
version = "0.4.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "hermit-abi"
|
|
||||||
version = "0.1.19"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
|
|
||||||
dependencies = [
|
|
||||||
"libc",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "indexmap"
|
|
||||||
version = "1.6.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3"
|
|
||||||
dependencies = [
|
|
||||||
"autocfg",
|
|
||||||
"hashbrown",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "lazy_static"
|
|
||||||
version = "1.4.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libc"
|
name = "libc"
|
||||||
version = "0.2.125"
|
version = "0.2.124"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b"
|
checksum = "21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "once_cell"
|
name = "once_cell"
|
||||||
@@ -151,81 +52,12 @@ version = "1.10.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"
|
checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "os_str_bytes"
|
|
||||||
version = "6.0.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "parameterized"
|
|
||||||
version = "1.0.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "33543d17fe882d6d8835b193d2c7f0fdc3317645ca7510aaaf6103848498381c"
|
|
||||||
dependencies = [
|
|
||||||
"parameterized-macro",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "parameterized-macro"
|
|
||||||
version = "1.0.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "24792407b50d07456abc531c1bc629a642a005d3b292c97dc23bf5bff1ad9cea"
|
|
||||||
dependencies = [
|
|
||||||
"indexmap",
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ppv-lite86"
|
name = "ppv-lite86"
|
||||||
version = "0.2.16"
|
version = "0.2.16"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
|
checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "proc-macro-error"
|
|
||||||
version = "1.0.4"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro-error-attr",
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn",
|
|
||||||
"version_check",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "proc-macro-error-attr"
|
|
||||||
version = "1.0.4"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"version_check",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "proc-macro2"
|
|
||||||
version = "1.0.37"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1"
|
|
||||||
dependencies = [
|
|
||||||
"unicode-xid",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "quote"
|
|
||||||
version = "1.0.18"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rand"
|
name = "rand"
|
||||||
version = "0.8.5"
|
version = "0.8.5"
|
||||||
@@ -275,38 +107,10 @@ checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
|
|||||||
name = "rusty_propagation"
|
name = "rusty_propagation"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"clap",
|
|
||||||
"console",
|
"console",
|
||||||
"parameterized",
|
|
||||||
"rand",
|
"rand",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "strsim"
|
|
||||||
version = "0.10.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "syn"
|
|
||||||
version = "1.0.92"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "7ff7c592601f11445996a06f8ad0c27f094a58857c2f89e97974ab9235b92c52"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"unicode-xid",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "termcolor"
|
|
||||||
version = "1.1.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
|
|
||||||
dependencies = [
|
|
||||||
"winapi-util",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "terminal_size"
|
name = "terminal_size"
|
||||||
version = "0.1.17"
|
version = "0.1.17"
|
||||||
@@ -317,30 +121,12 @@ dependencies = [
|
|||||||
"winapi",
|
"winapi",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "textwrap"
|
|
||||||
version = "0.15.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "unicode-width"
|
name = "unicode-width"
|
||||||
version = "0.1.9"
|
version = "0.1.9"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
|
checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "unicode-xid"
|
|
||||||
version = "0.2.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "version_check"
|
|
||||||
version = "0.9.4"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasi"
|
name = "wasi"
|
||||||
version = "0.10.2+wasi-snapshot-preview1"
|
version = "0.10.2+wasi-snapshot-preview1"
|
||||||
@@ -363,15 +149,6 @@ version = "0.4.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "winapi-util"
|
|
||||||
version = "0.1.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
|
|
||||||
dependencies = [
|
|
||||||
"winapi",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winapi-x86_64-pc-windows-gnu"
|
name = "winapi-x86_64-pc-windows-gnu"
|
||||||
version = "0.4.0"
|
version = "0.4.0"
|
||||||
|
|||||||
@@ -5,6 +5,4 @@ edition = "2021"
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
console = "0.15.0"
|
console = "0.15.0"
|
||||||
rand = "0.8.5"
|
rand = "0.8.5"
|
||||||
parameterized = "1.0.0"
|
|
||||||
clap = { version = "3.1.15", features = ["derive"] }
|
|
||||||
9
ReadMe.md
Normal file
9
ReadMe.md
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
# Rusty Propagation
|
||||||
|
Run :
|
||||||
|
```
|
||||||
|
cargo run -q
|
||||||
|
```
|
||||||
|
Speed run :
|
||||||
|
```
|
||||||
|
cargo run -q --release
|
||||||
|
```
|
||||||
@@ -1,24 +1,25 @@
|
|||||||
// use crate::prelude::*;
|
// use crate::prelude::*;
|
||||||
|
|
||||||
|
|
||||||
// pub const MUTATION_TRAIT_INCREASE_PROBABILITY:i32 = 50;
|
// pub const MUTATION_TRAIT_INCREASE_PROBABILITY:i32 = 50;
|
||||||
// pub const MUTATION_TRAIT_CHANGE_AMOUNT:i32 = 20;
|
// pub const MUTATION_TRAIT_CHANGE_AMOUNT:i32 = 20;
|
||||||
|
|
||||||
// #[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct Disease {
|
pub struct Disease {
|
||||||
pub infection_rate: i32,
|
pub infection_rate:u32,
|
||||||
pub curing_rate: i32,
|
pub curing_rate:u32,
|
||||||
pub death_rate: i32,
|
pub death_rate:u32,
|
||||||
pub traits: Vec<i32>,
|
pub traits: Vec<u32>,
|
||||||
pub name: String,
|
pub name: String,
|
||||||
}
|
}
|
||||||
impl Disease {
|
impl Disease{
|
||||||
pub fn new(infection_r: i32, curing_r: i32, death_r: i32, the_name: String) -> Self {
|
pub fn new(infection_r:u32,curing_r:u32,death_r:u32,the_name:String) -> Self{
|
||||||
Self {
|
Self{
|
||||||
infection_rate: infection_r,
|
infection_rate : infection_r,
|
||||||
curing_rate: curing_r,
|
curing_rate : curing_r,
|
||||||
death_rate: death_r,
|
death_rate : death_r,
|
||||||
name: the_name,
|
name : the_name,
|
||||||
traits: vec![infection_r, curing_r, death_r],
|
traits : vec![infection_r,curing_r,death_r],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// pub fn mutate(&mut self){
|
// pub fn mutate(&mut self){
|
||||||
@@ -38,4 +39,4 @@ impl Disease {
|
|||||||
// self.traits[i] = new_ratio as u32;
|
// self.traits[i] = new_ratio as u32;
|
||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
44
src/human.rs
44
src/human.rs
@@ -1,33 +1,33 @@
|
|||||||
// use crate::prelude::*;
|
// use crate::prelude::*;
|
||||||
|
|
||||||
// #[derive(Copy, Clone, PartialEq)]
|
// #[derive(Copy, Clone, PartialEq)]
|
||||||
#[derive(PartialEq, Debug, Clone)]
|
#[derive(PartialEq)]
|
||||||
pub enum State {
|
pub enum State {
|
||||||
Normal,
|
Normal,
|
||||||
Infected,
|
Infected,
|
||||||
Dead,
|
Dead,
|
||||||
Immune,
|
Immune,
|
||||||
}
|
}
|
||||||
#[derive(Clone)]
|
// #[derive(Clone)]
|
||||||
pub struct Human {
|
pub struct Human {
|
||||||
pub present_state: State,
|
pub present_state : State,
|
||||||
pub x: i32,
|
pub x : i32,
|
||||||
pub y: i32,
|
pub y : i32,
|
||||||
}
|
}
|
||||||
// impl Human {
|
impl Human{
|
||||||
// // humans with state "Normal"
|
// humans with state "Normal"
|
||||||
// pub fn new(pos_x: i32, pos_y: i32) -> Self {
|
pub fn new(pos_x :i32, pos_y :i32) -> Self{
|
||||||
// Self {
|
Self{
|
||||||
// present_state: State::Normal,
|
present_state : State::Normal,
|
||||||
// x: pos_x,
|
x : pos_x,
|
||||||
// y: pos_y,
|
y : pos_y
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
// // pub fn new_empty() -> Self{
|
// pub fn new_empty() -> Self{
|
||||||
// // Self{
|
// Self{
|
||||||
// // present_state:State::Normal,
|
// present_state:State::Normal,
|
||||||
// // x : 0,
|
// x : 0,
|
||||||
// // y : 0,
|
// y : 0,
|
||||||
// // }
|
// }
|
||||||
// // }
|
// }
|
||||||
// }
|
}
|
||||||
68
src/main.rs
68
src/main.rs
@@ -1,64 +1,44 @@
|
|||||||
mod disease;
|
|
||||||
mod human;
|
mod human;
|
||||||
|
mod disease;
|
||||||
mod population;
|
mod population;
|
||||||
mod prelude {
|
mod prelude {
|
||||||
pub use crate::disease::*;
|
|
||||||
pub use crate::human::*;
|
pub use crate::human::*;
|
||||||
|
pub use crate::disease::*;
|
||||||
pub use crate::population::*;
|
pub use crate::population::*;
|
||||||
pub use console::style;
|
|
||||||
pub use console::Term;
|
|
||||||
pub use rand::Rng;
|
pub use rand::Rng;
|
||||||
pub const CORRECTED_PERCENTAGE: i32 = 101;
|
pub use console::Term;
|
||||||
|
pub use console::style;
|
||||||
|
pub const CORRECTED_PERCENTAGE:i32 = 101;
|
||||||
}
|
}
|
||||||
|
|
||||||
use prelude::*;
|
use prelude::*;
|
||||||
use clap::Parser;
|
|
||||||
use std::time::Instant;
|
|
||||||
|
|
||||||
#[derive(Parser, Debug)]
|
|
||||||
struct Args {
|
|
||||||
/// Display stats after each propagation
|
|
||||||
#[clap(short, long)]
|
|
||||||
display: bool,
|
|
||||||
/// Width of humans grid in population
|
|
||||||
#[clap(short, long, default_value_t = 1000)]
|
|
||||||
width: i32,
|
|
||||||
/// Height of humans grid in population
|
|
||||||
#[clap(short, long, default_value_t = 1000)]
|
|
||||||
height: i32,
|
|
||||||
}
|
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
let args = Args::parse();
|
|
||||||
|
|
||||||
let term = Term::stdout();
|
let term = Term::stdout();
|
||||||
term.write_line("********** Rusty Propagation (Console) 2022 **********")
|
term.write_line("********** Rusty Propagation (Console) 2022 **********").expect("Oops Looks like we have a problem here...");
|
||||||
.expect("Oops Looks like we have a problem here...");
|
term.write_line("Press any key to start the propagation").expect("Oops Looks like we have a problem here...");
|
||||||
|
|
||||||
let disease = Disease::new(20, 10, 5, String::from("Covid 44"));
|
|
||||||
let mut population = Population::new(20,10,5,args.width,args.height,disease);
|
let disease = Disease::new(20,10,5,String::from("Covid 44"));
|
||||||
|
let mut population = Population::new(20,10,5,1000,1000,disease);
|
||||||
//population.change_disease(disease);
|
//population.change_disease(disease);
|
||||||
|
println!("Before Filling");
|
||||||
|
//population.display();
|
||||||
|
population.generate();
|
||||||
println!("After Filling");
|
println!("After Filling");
|
||||||
//population.display();
|
//population.display();
|
||||||
//population.display();
|
println!("After Propagation");
|
||||||
let mut stats: [i32; 4];
|
let mut stats: [i32;4];
|
||||||
// = [0,0,0,0];
|
// = [0,0,0,0];
|
||||||
let mut counter: u32 = 0;
|
let mut counter:u32 = 0;
|
||||||
let now = Instant::now();
|
loop{
|
||||||
loop {
|
|
||||||
counter += 1;
|
counter += 1;
|
||||||
stats = population.propagate();
|
stats=population.propagate();
|
||||||
//population.display();
|
//population.display();
|
||||||
if args.display {
|
println!("Infecteds: {} Immunes: {} Deads: {}",stats[1],stats[2],stats[3]);
|
||||||
println!(
|
if stats[1] == 0 {break;}
|
||||||
"Normal: {} Infecteds: {} Immunes: {} Deads: {}",
|
}
|
||||||
stats[0], stats[1], stats[2], stats[3]
|
println!("Propagation finished in {} steps",counter);
|
||||||
);
|
|
||||||
}
|
|
||||||
if stats[1] == 0 {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
println!("Propagation finished in {} steps, {:?}", counter, now.elapsed());
|
|
||||||
//population.display();
|
//population.display();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,208 +1,187 @@
|
|||||||
use crate::prelude::*;
|
use crate::prelude::*;
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct Point {
|
pub struct Point{
|
||||||
x: i32,
|
x:i32,
|
||||||
y: i32,
|
y:i32,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct Population {
|
pub struct Population{
|
||||||
pub start_infected_ratio: i32,
|
pub start_infected_ratio:u32,
|
||||||
pub start_immune_ratio: i32,
|
pub start_immune_ratio:u32,
|
||||||
pub start_dead_ratio: i32,
|
pub start_dead_ratio:u32,
|
||||||
pub humans: Vec<Human>,
|
pub humans:Vec<Human>,
|
||||||
pub width: i32,
|
pub width:i32,
|
||||||
pub height: i32,
|
pub height:i32,
|
||||||
pub age: i32,
|
pub age:i32,
|
||||||
pub plague: Disease,
|
pub plague:Disease,
|
||||||
pub size: usize,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn human_idx(x: i32, y: i32, width: i32) -> usize {
|
pub fn human_idx(x: i32, y: i32, width: i32) -> usize {
|
||||||
((y * width) + x) as usize
|
((y * width) + x)as usize
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Population {
|
impl Population{
|
||||||
pub fn new(
|
pub fn new(start_infected_ratio:u32,start_immune_ratio:u32,start_dead_ratio:u32,width:i32,height:i32,plague:Disease)->Self{
|
||||||
start_infected_ratio: i32,
|
let mut the_humans: Vec<Human> = Vec::with_capacity((width*height) as usize);
|
||||||
start_immune_ratio: i32,
|
for x in 0..width{
|
||||||
start_dead_ratio: i32,
|
for y in 0..height{
|
||||||
width: i32,
|
the_humans.push(Human::new(x, y));
|
||||||
height: i32,
|
|
||||||
plague: Disease,
|
|
||||||
) -> Self {
|
|
||||||
let mut rng = rand::thread_rng();
|
|
||||||
|
|
||||||
let size: usize = (width * height) as usize;
|
|
||||||
|
|
||||||
let mut the_humans: Vec<Human> = vec![
|
|
||||||
Human {
|
|
||||||
x: 0,
|
|
||||||
y: 0,
|
|
||||||
present_state: State::Normal
|
|
||||||
};
|
|
||||||
size
|
|
||||||
];
|
|
||||||
for x in 0..width {
|
|
||||||
for y in 0..height {
|
|
||||||
let idx = human_idx(x, y, width);
|
|
||||||
let mut present_state = State::Normal;
|
|
||||||
if (start_infected_ratio > 0)
|
|
||||||
&& (rng.gen_range(0..CORRECTED_PERCENTAGE) <= start_infected_ratio)
|
|
||||||
{
|
|
||||||
present_state = State::Infected;
|
|
||||||
} else if (start_immune_ratio > 0)
|
|
||||||
&& (rng.gen_range(0..CORRECTED_PERCENTAGE) <= start_immune_ratio)
|
|
||||||
{
|
|
||||||
present_state = State::Immune;
|
|
||||||
} else if (start_dead_ratio > 0)
|
|
||||||
&& (rng.gen_range(0..CORRECTED_PERCENTAGE) <= start_dead_ratio)
|
|
||||||
{
|
|
||||||
present_state = State::Dead;
|
|
||||||
}
|
|
||||||
the_humans[idx] = Human{x: x, y: y, present_state: present_state};
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Self {
|
Self{
|
||||||
start_infected_ratio: start_infected_ratio,
|
start_infected_ratio:start_infected_ratio,
|
||||||
start_immune_ratio: start_immune_ratio,
|
start_immune_ratio:start_immune_ratio,
|
||||||
start_dead_ratio: start_dead_ratio,
|
start_dead_ratio:start_dead_ratio,
|
||||||
width: width,
|
width:width,
|
||||||
height: height,
|
height:height,
|
||||||
plague: plague,
|
plague:plague,
|
||||||
age: 0,
|
age:0,
|
||||||
humans: the_humans,
|
humans:the_humans,
|
||||||
size: size,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// pub fn change_disease(&mut self, plague:Disease){
|
// pub fn change_disease(&mut self, plague:Disease){
|
||||||
// self.plague = plague;
|
// self.plague = plague;
|
||||||
// }
|
// }
|
||||||
|
pub fn generate(&mut self){
|
||||||
fn is_inside(&self, pos: &Point) -> bool {
|
//The ratios will not be exact, for example someone who wants 100% infected 100% immune and 100% dead, he will have 100% dead because they are overwriting each others
|
||||||
if pos.x >= 0 && pos.x < self.width && pos.y >= 0 && pos.y < self.height {
|
//Maybe consider limiting the total to not exceed 100 in the view
|
||||||
true
|
//Other thing, there will always be more of the last one because someone who is already infected for example could be then put to immune or dead
|
||||||
} else {
|
//One solution to this issue would be to have if else else statements but in this case for example 20% would be lower with the last because its 20% on the remaining population and not of the all
|
||||||
false
|
//In other words I did it that way but it can be changed just its not the right method to have perfect ratios
|
||||||
}
|
let mut rng = rand::thread_rng();
|
||||||
}
|
let mut i: i32 = 0;
|
||||||
|
for x in self.humans.iter_mut() {
|
||||||
fn is_inside_and_infected(&self, point: Point) -> bool {
|
if rng.gen_range(0..CORRECTED_PERCENTAGE) < self.start_infected_ratio as i32
|
||||||
if self.is_inside(&point) {
|
{
|
||||||
let idx = human_idx(point.x, point.y, self.width);
|
x.present_state = State::Infected;
|
||||||
if self.humans[idx].present_state == State::Infected {
|
|
||||||
roll(self.plague.infection_rate)
|
|
||||||
} else {
|
|
||||||
false
|
|
||||||
}
|
}
|
||||||
} else {
|
if rng.gen_range(0..CORRECTED_PERCENTAGE) < self.start_immune_ratio as i32
|
||||||
false
|
{
|
||||||
|
x.present_state = State::Immune;
|
||||||
|
}
|
||||||
|
if rng.gen_range(0..CORRECTED_PERCENTAGE) < self.start_dead_ratio as i32
|
||||||
|
{
|
||||||
|
x.present_state = State::Dead;
|
||||||
|
}
|
||||||
|
i += 1;
|
||||||
}
|
}
|
||||||
|
println!("generate for {} humans", i);
|
||||||
}
|
}
|
||||||
|
pub fn propagate(&mut self)->[i32;4]{
|
||||||
pub fn propagate(&mut self) -> [i32; 4] {
|
let mut people_to_check:Vec<Point> = Vec::with_capacity((self.width * self.height) as usize);
|
||||||
let mut people_to_check: Vec<Point> =
|
let mut people_to_infect:Vec<Point> = Vec::with_capacity((self.width * self.height) as usize);
|
||||||
Vec::with_capacity(self.size);
|
let mut people_to_cure:Vec<Point> = Vec::with_capacity((self.width * self.height) as usize);
|
||||||
let mut possible_infected: Vec<Point> =
|
let mut people_to_kill:Vec<Point> = Vec::with_capacity((self.width * self.height) as usize);
|
||||||
Vec::with_capacity(self.size);
|
let mut stats: [i32;4] = [0,0,0,0];
|
||||||
let mut people_to_infect: Vec<Point> =
|
|
||||||
Vec::with_capacity(self.size);
|
|
||||||
let mut people_to_cure: Vec<Point> =
|
|
||||||
Vec::with_capacity(self.size);
|
|
||||||
let mut people_to_kill: Vec<Point> =
|
|
||||||
Vec::with_capacity(self.size);
|
|
||||||
let mut stats: [i32; 4] = [0, 0, 0, 0];
|
|
||||||
// stats[0] Normal stats[1] Infected stats[2] Immune stats[3] Dead
|
// stats[0] Normal stats[1] Infected stats[2] Immune stats[3] Dead
|
||||||
|
|
||||||
|
/*
|
||||||
for h in self.humans.iter() {
|
for h in self.humans.iter() {
|
||||||
match h.present_state {
|
match h.present_state{
|
||||||
State::Normal => {
|
State::Normal => {stats[0] += 1;}
|
||||||
possible_infected.push(Point{ x: h.x, y: h.y});
|
State::Infected => {people_to_check.push(Point{x:h.x,y:h.y});stats[1]+=1;}
|
||||||
stats[0] += 1;
|
State::Immune => {stats[2] += 1;}
|
||||||
}
|
State::Dead => {stats[3] += 1;}
|
||||||
State::Infected => {
|
}
|
||||||
people_to_check.push(Point { x: h.x, y: h.y });
|
}
|
||||||
stats[1] += 1;
|
*/
|
||||||
}
|
|
||||||
State::Immune => {
|
for x in 0..self.width{
|
||||||
stats[2] += 1;
|
for y in 0..self.height{
|
||||||
}
|
let idx = human_idx(x as i32, y as i32, self.width as i32);
|
||||||
State::Dead => {
|
match self.humans[idx].present_state{
|
||||||
stats[3] += 1;
|
State::Normal => {stats[0] += 1;}
|
||||||
|
State::Infected => {people_to_check.push(Point{x:x,y:y});stats[1]+=1;}
|
||||||
|
State::Immune => {stats[2] += 1;}
|
||||||
|
State::Dead => {stats[3] += 1;}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// for pos in &people_to_check {
|
|
||||||
|
//for pos in &people_to_check {
|
||||||
for pos in people_to_check.iter() {
|
for pos in people_to_check.iter() {
|
||||||
//people_to_check.iter().map(|pos|{
|
//people_to_check.iter().map(|pos|{
|
||||||
//get all the other people next to me and check if i die cure or infect
|
//get all the other people next to me and check if i die cure or infect
|
||||||
//now we can start to check if people would be infected or not
|
//now we can start to check if people would be infected or not
|
||||||
//let idx = human_idx(pos.x as i32, pos.y as i32, self.width as i32);
|
//let idx = human_idx(pos.x as i32, pos.y as i32, self.width as i32);
|
||||||
if roll(self.plague.curing_rate) {
|
if pos.x > 0 && pos.x < self.width - 1 && pos.y > 0 && pos.y < self.height -1 {
|
||||||
//checks if the man recovers
|
if self.roll(self.plague.curing_rate){
|
||||||
people_to_cure.push(Point { x: pos.x, y: pos.y });
|
//checks if the man dies
|
||||||
} else {
|
people_to_cure.push(Point{x:pos.x,y:pos.y});
|
||||||
if roll(self.plague.death_rate) {
|
}else{
|
||||||
//cheks if the man dies
|
if self.roll(self.plague.death_rate){
|
||||||
people_to_kill.push(Point { x: pos.x, y: pos.y });
|
//cheks if the man dies
|
||||||
}
|
people_to_kill.push(Point{x:pos.x,y:pos.y});
|
||||||
}
|
}else{
|
||||||
}
|
let mut possible_infections:Vec<Point> = Vec::with_capacity(8);
|
||||||
for pos in possible_infected.iter() {
|
// Vec::new();
|
||||||
let infected: bool = self.is_inside_and_infected(
|
//possible_infections.push(Point{x:pos.x,y:pos.y});
|
||||||
Point {
|
|
||||||
x: pos.x - 1,
|
|
||||||
y: pos.y - 1,
|
|
||||||
},
|
|
||||||
) || //Top Left
|
|
||||||
self.is_inside_and_infected(
|
|
||||||
Point {
|
|
||||||
x: pos.x,
|
|
||||||
y: pos.y - 1,
|
|
||||||
},
|
|
||||||
) || //Top
|
|
||||||
self.is_inside_and_infected(
|
|
||||||
Point {
|
|
||||||
x: pos.x + 1,
|
|
||||||
y: pos.y - 1,
|
|
||||||
},
|
|
||||||
) || //Top Right
|
|
||||||
self.is_inside_and_infected(
|
|
||||||
Point {
|
|
||||||
x: pos.x - 1,
|
|
||||||
y: pos.y,
|
|
||||||
},
|
|
||||||
) || //Left
|
|
||||||
self.is_inside_and_infected(
|
|
||||||
Point {
|
|
||||||
x: pos.x + 1,
|
|
||||||
y: pos.y,
|
|
||||||
},
|
|
||||||
) || //Right
|
|
||||||
self.is_inside_and_infected(
|
|
||||||
Point {
|
|
||||||
x: pos.x - 1,
|
|
||||||
y: pos.y + 1,
|
|
||||||
},
|
|
||||||
) || //Bottom Left
|
|
||||||
self.is_inside_and_infected(
|
|
||||||
Point {
|
|
||||||
x: pos.x,
|
|
||||||
y: pos.y + 1,
|
|
||||||
},
|
|
||||||
) || //Bottom
|
|
||||||
self.is_inside_and_infected(
|
|
||||||
Point {
|
|
||||||
x: pos.x + 1,
|
|
||||||
y: pos.y + 1,
|
|
||||||
},
|
|
||||||
); //Bottom Right
|
|
||||||
if infected {
|
|
||||||
people_to_infect.push(Point { x: pos.x, y: pos.y });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for infected_position in people_to_infect.iter() {
|
possible_infections.push(Point{x:pos.x -1,y:pos.y -1}); //Top Left
|
||||||
|
possible_infections.push(Point{x:pos.x,y:pos.y-1}); //Top
|
||||||
|
possible_infections.push(Point{x:pos.x +1,y:pos.y -1}); //Top Right
|
||||||
|
|
||||||
|
possible_infections.push(Point{x:pos.x -1,y:pos.y}); //Left
|
||||||
|
possible_infections.push(Point{x:pos.x +1,y:pos.y}); //Right
|
||||||
|
|
||||||
|
possible_infections.push(Point{x:pos.x -1,y:pos.y + 1}); //Bottom Left
|
||||||
|
possible_infections.push(Point{x:pos.x,y:pos.y + 1}); //Bottom
|
||||||
|
possible_infections.push(Point{x:pos.x + 1,y:pos.y + 1}); //Bottom Right
|
||||||
|
|
||||||
|
for poss_infected_pos in possible_infections.iter() {
|
||||||
|
//possible_infections.iter().map(|poss_infected_pos|{
|
||||||
|
let inf_idx = human_idx(poss_infected_pos.x, poss_infected_pos.y, self.width);
|
||||||
|
if self.humans[inf_idx].present_state == State::Normal{
|
||||||
|
if self.roll(self.plague.infection_rate){
|
||||||
|
people_to_infect.push(Point{x:poss_infected_pos.x,y:poss_infected_pos.y});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
//TODO
|
||||||
|
//Check every special cases (corners sides etc..)
|
||||||
|
|
||||||
|
//REMOVE WHEN IMPLEMENTED
|
||||||
|
//It is here to prevent an infected in the borders to keep the programm running as he thinks there are still people to simulate
|
||||||
|
people_to_kill.push(Point{x:pos.x,y:pos.y});
|
||||||
|
|
||||||
|
// @##
|
||||||
|
// ###
|
||||||
|
// ###
|
||||||
|
|
||||||
|
// #@#
|
||||||
|
// ###
|
||||||
|
// ###
|
||||||
|
|
||||||
|
// ##@
|
||||||
|
// ###
|
||||||
|
// ###
|
||||||
|
|
||||||
|
// ###
|
||||||
|
// @##
|
||||||
|
// ###
|
||||||
|
|
||||||
|
// ###
|
||||||
|
// ##@
|
||||||
|
// ###
|
||||||
|
|
||||||
|
// ###
|
||||||
|
// ###
|
||||||
|
// @##
|
||||||
|
|
||||||
|
// ###
|
||||||
|
// ###
|
||||||
|
// #@#
|
||||||
|
|
||||||
|
// ###
|
||||||
|
// ###
|
||||||
|
// ##@
|
||||||
|
}
|
||||||
|
};
|
||||||
|
for infected_position in &people_to_infect {
|
||||||
// println!("To infect: {:?}", infected_position);
|
// println!("To infect: {:?}", infected_position);
|
||||||
//people_to_infect.iter().map(|infected_position|{
|
//people_to_infect.iter().map(|infected_position|{
|
||||||
let infected_index = human_idx(infected_position.x, infected_position.y, self.width);
|
let infected_index = human_idx(infected_position.x, infected_position.y, self.width);
|
||||||
@@ -212,508 +191,45 @@ impl Population {
|
|||||||
self.humans[infected_index].present_state = State::Infected;
|
self.humans[infected_index].present_state = State::Infected;
|
||||||
//DEBUG
|
//DEBUG
|
||||||
//println!("Infected someone");
|
//println!("Infected someone");
|
||||||
}
|
};
|
||||||
|
|
||||||
for cured_position in people_to_cure.iter() {
|
for cured_position in &people_to_cure {
|
||||||
//people_to_cure.iter().map(|cured_position|{
|
//people_to_cure.iter().map(|cured_position|{
|
||||||
let cured_index = human_idx(cured_position.x, cured_position.y, self.width);
|
let cured_index = human_idx(cured_position.x, cured_position.y, self.width);
|
||||||
if self.humans[cured_index].present_state != State::Infected {
|
|
||||||
println!("not infected");
|
|
||||||
}
|
|
||||||
self.humans[cured_index].present_state = State::Immune;
|
self.humans[cured_index].present_state = State::Immune;
|
||||||
//DEBUG
|
//DEBUG
|
||||||
//println!("Cured someone");
|
//println!("Cured someone");
|
||||||
}
|
};
|
||||||
|
|
||||||
for dead_position in people_to_kill.iter() {
|
for dead_position in &people_to_kill {
|
||||||
//people_to_kill.iter().map(|dead_position|{
|
//people_to_kill.iter().map(|dead_position|{
|
||||||
let dead_index = human_idx(dead_position.x, dead_position.y, self.width);
|
let dead_index = human_idx(dead_position.x, dead_position.y, self.width);
|
||||||
if self.humans[dead_index].present_state == State::Dead {
|
self.humans[dead_index].present_state = State::Dead;
|
||||||
// println!("Already dead");
|
|
||||||
} else {
|
|
||||||
self.humans[dead_index].present_state = State::Dead;
|
|
||||||
}
|
|
||||||
//DEBUG
|
//DEBUG
|
||||||
}
|
//println!("Killed someone");
|
||||||
assert_eq!(
|
};
|
||||||
stats[0] + stats[1] + stats[2] + stats[3],
|
|
||||||
self.size as i32
|
|
||||||
);
|
|
||||||
stats
|
stats
|
||||||
}
|
}
|
||||||
|
pub fn roll(&self,probability:u32)->bool{
|
||||||
// pub fn display(&mut self){
|
|
||||||
// let sprite = "#";
|
|
||||||
// print!("\n");
|
|
||||||
// for x in 0..self.width{
|
|
||||||
// for y in 0..self.height{
|
|
||||||
// let index = human_idx(x as i32,y as i32,self.width as i32);
|
|
||||||
// match self.humans[index].present_state {
|
|
||||||
// State::Normal => print!("{}",style(sprite).green()),
|
|
||||||
// State::Dead => print!("{}",style(sprite).black()),
|
|
||||||
// State::Infected => print!("{}",style(sprite).red()),
|
|
||||||
// State::Immune => print!("{}",style(sprite).blue()),
|
|
||||||
// _ => print!("{}",style(sprite).white()),
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// print!("\n");
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn roll(probability: i32) -> bool {
|
|
||||||
if probability > 0 {
|
|
||||||
let mut rng = rand::thread_rng();
|
let mut rng = rand::thread_rng();
|
||||||
rng.gen_range(0..CORRECTED_PERCENTAGE) <= probability
|
rng.gen_range(0..CORRECTED_PERCENTAGE) <= probability as i32
|
||||||
} else {
|
}
|
||||||
false
|
pub fn display(&mut self){
|
||||||
}
|
let sprite = "#";
|
||||||
}
|
print!("\n");
|
||||||
|
for x in 0..self.width{
|
||||||
#[cfg(test)]
|
for y in 0..self.height{
|
||||||
mod tests {
|
let index = human_idx(x as i32,y as i32,self.width as i32);
|
||||||
use super::*;
|
match self.humans[index].present_state {
|
||||||
use parameterized::parameterized;
|
State::Normal => print!("{}",style(sprite).green()),
|
||||||
|
State::Dead => print!("{}",style(sprite).black()),
|
||||||
#[derive(Debug)]
|
State::Infected => print!("{}",style(sprite).red()),
|
||||||
struct Stats {
|
State::Immune => print!("{}",style(sprite).blue()),
|
||||||
normal: i32,
|
_ => print!("{}",style(sprite).white()),
|
||||||
infected: i32,
|
|
||||||
immune: i32,
|
|
||||||
dead: i32,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Stats {
|
|
||||||
fn new() -> Stats {
|
|
||||||
Stats {
|
|
||||||
normal: 0,
|
|
||||||
infected: 0,
|
|
||||||
immune: 0,
|
|
||||||
dead: 0,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn humans_stats(humans: &Vec<Human>) -> Stats {
|
|
||||||
let mut stats: Stats = Stats::new();
|
|
||||||
for human in humans.iter() {
|
|
||||||
match human.present_state {
|
|
||||||
State::Normal => {
|
|
||||||
stats.normal += 1;
|
|
||||||
}
|
|
||||||
State::Infected => {
|
|
||||||
stats.infected += 1;
|
|
||||||
}
|
|
||||||
State::Immune => {
|
|
||||||
stats.immune += 1;
|
|
||||||
}
|
|
||||||
State::Dead => {
|
|
||||||
stats.dead += 1;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
print!("\n");
|
||||||
stats
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
#[parameterized(x = {
|
|
||||||
2, 3, 5
|
|
||||||
}, y = {
|
|
||||||
1, 4, 0
|
|
||||||
}, width = {
|
|
||||||
3, 5, 7
|
|
||||||
}, res = {
|
|
||||||
5, 23, 5
|
|
||||||
})]
|
|
||||||
fn test_human_idx(x: i32, y: i32, width: i32, res: usize) {
|
|
||||||
assert_eq!(human_idx(x, y, width), res);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_human_stats() {
|
|
||||||
let mut humans: Vec<Human> = Vec::with_capacity(10);
|
|
||||||
let mut stats: Stats;
|
|
||||||
|
|
||||||
for _ in 0..10 {
|
|
||||||
humans.push(Human {
|
|
||||||
present_state: State::Normal,
|
|
||||||
x: 0,
|
|
||||||
y: 0,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
stats = humans_stats(&humans);
|
|
||||||
assert_eq!(stats.normal, 10);
|
|
||||||
|
|
||||||
for x in 0..2 {
|
|
||||||
humans[x].present_state = State::Infected;
|
|
||||||
}
|
|
||||||
for x in 2..5 {
|
|
||||||
humans[x].present_state = State::Immune;
|
|
||||||
}
|
|
||||||
for x in 5..9 {
|
|
||||||
humans[x].present_state = State::Dead;
|
|
||||||
}
|
|
||||||
stats = humans_stats(&humans);
|
|
||||||
assert_eq!(stats.normal, 1);
|
|
||||||
assert_eq!(stats.infected, 2);
|
|
||||||
assert_eq!(stats.immune, 3);
|
|
||||||
assert_eq!(stats.dead, 4);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn population_new() {
|
|
||||||
let disease = Disease::new(20, 10, 5, String::from("Covid 44"));
|
|
||||||
let (width, height) = (5, 7);
|
|
||||||
let population = Population::new(20, 10, 5, 5, 7, disease);
|
|
||||||
assert_eq!(population.humans.len(), 5 * 7);
|
|
||||||
for h in population.humans.iter() {
|
|
||||||
let idx = human_idx(h.x, h.y, width);
|
|
||||||
assert_eq!(population.humans[idx].x, h.x, "coordinates should match");
|
|
||||||
assert_eq!(population.humans[idx].y, h.y, "coordinates should match");
|
|
||||||
}
|
|
||||||
assert_eq!(population.humans.len(), (width * height) as usize);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn population_gen() {
|
|
||||||
let disease = Disease::new(20, 10, 5, String::from("Covid 44"));
|
|
||||||
let (width, height) = (5, 7);
|
|
||||||
let population = Population::new(20, 10, 5, 5, 7, disease);
|
|
||||||
|
|
||||||
let stats: Stats = humans_stats(&population.humans);
|
|
||||||
println!("Stats: {:?}", stats);
|
|
||||||
|
|
||||||
assert_eq!(
|
|
||||||
stats.normal + stats.infected + stats.immune + stats.dead,
|
|
||||||
width * height
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn plague_init_stats() {
|
|
||||||
let mut disease: Disease;
|
|
||||||
let mut population: Population;
|
|
||||||
let mut stats: Stats;
|
|
||||||
let (width, height) = (5, 7);
|
|
||||||
|
|
||||||
disease = Disease::new(0, 0, 0, String::from("Test"));
|
|
||||||
population = Population::new(0, 0, 0, width, height, disease);
|
|
||||||
stats = humans_stats(&population.humans);
|
|
||||||
println!("should be normal: {:?}", stats);
|
|
||||||
assert_eq!(stats.normal, width * height);
|
|
||||||
|
|
||||||
disease = Disease::new(0, 0, 0, String::from("Test"));
|
|
||||||
population = Population::new(100, 0, 0, width, height, disease);
|
|
||||||
stats = humans_stats(&population.humans);
|
|
||||||
println!("should be infected: {:?}", stats);
|
|
||||||
assert_eq!(stats.infected, width * height);
|
|
||||||
|
|
||||||
disease = Disease::new(0, 0, 0, String::from("Test"));
|
|
||||||
population = Population::new(0, 100, 0, width, height, disease);
|
|
||||||
stats = humans_stats(&population.humans);
|
|
||||||
println!("should be immune: {:?}", stats);
|
|
||||||
assert_eq!(stats.immune, width * height);
|
|
||||||
|
|
||||||
disease = Disease::new(0, 0, 0, String::from("Test"));
|
|
||||||
population = Population::new(0, 0, 100, width, height, disease);
|
|
||||||
stats = humans_stats(&population.humans);
|
|
||||||
println!("should be dead: {:?}", stats);
|
|
||||||
assert_eq!(stats.dead, width * height);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[parameterized(rate = {0, 100}, expected = {false, true})]
|
|
||||||
fn roll_test(rate: i32, expected: bool) {
|
|
||||||
let tries = 100000;
|
|
||||||
let mut result = 0;
|
|
||||||
println!("Testing roll, rate {}, expected {}", rate, expected);
|
|
||||||
for _x in 0..tries {
|
|
||||||
if roll(rate) == expected {
|
|
||||||
result += 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
assert_eq!(result, tries);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn propagate_simple() {
|
|
||||||
let disease: Disease = Disease::new(0, 0, 100, String::from("Deadly"));
|
|
||||||
let mut population: Population = Population::new(100, 0, 0, 10, 10, disease);
|
|
||||||
let mut stats: Stats;
|
|
||||||
let mut propagate_stats: [i32; 4];
|
|
||||||
|
|
||||||
// infect every one
|
|
||||||
stats = humans_stats(&population.humans);
|
|
||||||
println!("stats after init: {:?}", stats);
|
|
||||||
assert_eq!(stats.infected, 100, "everybody should be infected");
|
|
||||||
|
|
||||||
// kill every one
|
|
||||||
propagate_stats = population.propagate();
|
|
||||||
stats = humans_stats(&population.humans);
|
|
||||||
println!("propate_stats: {:?}", propagate_stats);
|
|
||||||
assert_eq!(propagate_stats, [0, 100, 0, 0]);
|
|
||||||
assert_eq!(stats.normal, 0);
|
|
||||||
assert_eq!(stats.infected, 0);
|
|
||||||
assert_eq!(stats.immune, 0);
|
|
||||||
assert_eq!(stats.dead, 100);
|
|
||||||
|
|
||||||
for _x in 0..100 {
|
|
||||||
propagate_stats = population.propagate();
|
|
||||||
stats = humans_stats(&population.humans);
|
|
||||||
println!("propate_stats: {:?}", propagate_stats);
|
|
||||||
assert_eq!(propagate_stats, [0, 0, 0, 100]);
|
|
||||||
assert_eq!(stats.normal, 0);
|
|
||||||
assert_eq!(stats.infected, 0);
|
|
||||||
assert_eq!(stats.immune, 0);
|
|
||||||
assert_eq!(stats.dead, 100);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn propagate_infect_all() {
|
|
||||||
let disease: Disease = Disease::new(100, 0, 0, String::from("Deadly"));
|
|
||||||
let mut population: Population = Population::new(0, 0, 0, 3, 3, disease);
|
|
||||||
let mut stats: Stats;
|
|
||||||
let mut propagate_stats: [i32; 4];
|
|
||||||
|
|
||||||
// start with normal population
|
|
||||||
population.humans = vec![
|
|
||||||
Human {
|
|
||||||
present_state: State::Normal,
|
|
||||||
x: 0,
|
|
||||||
y: 0,
|
|
||||||
},
|
|
||||||
Human {
|
|
||||||
present_state: State::Normal,
|
|
||||||
x: 1,
|
|
||||||
y: 0,
|
|
||||||
},
|
|
||||||
Human {
|
|
||||||
present_state: State::Normal,
|
|
||||||
x: 2,
|
|
||||||
y: 0,
|
|
||||||
},
|
|
||||||
Human {
|
|
||||||
present_state: State::Normal,
|
|
||||||
x: 0,
|
|
||||||
y: 1,
|
|
||||||
},
|
|
||||||
Human {
|
|
||||||
present_state: State::Infected,
|
|
||||||
x: 1,
|
|
||||||
y: 1,
|
|
||||||
},
|
|
||||||
Human {
|
|
||||||
present_state: State::Normal,
|
|
||||||
x: 2,
|
|
||||||
y: 1,
|
|
||||||
},
|
|
||||||
Human {
|
|
||||||
present_state: State::Normal,
|
|
||||||
x: 0,
|
|
||||||
y: 2,
|
|
||||||
},
|
|
||||||
Human {
|
|
||||||
present_state: State::Normal,
|
|
||||||
x: 1,
|
|
||||||
y: 2,
|
|
||||||
},
|
|
||||||
Human {
|
|
||||||
present_state: State::Normal,
|
|
||||||
x: 2,
|
|
||||||
y: 2,
|
|
||||||
},
|
|
||||||
];
|
|
||||||
stats = humans_stats(&population.humans);
|
|
||||||
println!("stats after init: {:?}", stats);
|
|
||||||
assert_eq!(stats.normal, 8);
|
|
||||||
|
|
||||||
// kill every one
|
|
||||||
propagate_stats = population.propagate();
|
|
||||||
stats = humans_stats(&population.humans);
|
|
||||||
println!("propate_stats: {:?}", propagate_stats);
|
|
||||||
assert_eq!(propagate_stats, [8, 1, 0, 0]);
|
|
||||||
assert_eq!(stats.normal, 0);
|
|
||||||
assert_eq!(stats.infected, 9);
|
|
||||||
assert_eq!(stats.immune, 0);
|
|
||||||
assert_eq!(stats.dead, 0);
|
|
||||||
|
|
||||||
for _x in 0..100 {
|
|
||||||
propagate_stats = population.propagate();
|
|
||||||
stats = humans_stats(&population.humans);
|
|
||||||
println!("propate_stats: {:?}", propagate_stats);
|
|
||||||
assert_eq!(propagate_stats, [0, 9, 0, 0]);
|
|
||||||
assert_eq!(stats.normal, 0);
|
|
||||||
assert_eq!(stats.infected, 9);
|
|
||||||
assert_eq!(stats.immune, 0);
|
|
||||||
assert_eq!(stats.dead, 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn propagate_infect_cure_all() {
|
|
||||||
let disease: Disease = Disease::new(100, 100, 0, String::from("Deadly"));
|
|
||||||
let mut population: Population = Population::new(0, 0, 0, 3, 3, disease);
|
|
||||||
let mut stats: Stats;
|
|
||||||
let mut propagate_stats: [i32; 4];
|
|
||||||
|
|
||||||
// start with normal population
|
|
||||||
population.humans = vec![
|
|
||||||
Human {
|
|
||||||
present_state: State::Normal,
|
|
||||||
x: 0,
|
|
||||||
y: 0,
|
|
||||||
},
|
|
||||||
Human {
|
|
||||||
present_state: State::Normal,
|
|
||||||
x: 1,
|
|
||||||
y: 0,
|
|
||||||
},
|
|
||||||
Human {
|
|
||||||
present_state: State::Normal,
|
|
||||||
x: 2,
|
|
||||||
y: 0,
|
|
||||||
},
|
|
||||||
Human {
|
|
||||||
present_state: State::Normal,
|
|
||||||
x: 0,
|
|
||||||
y: 1,
|
|
||||||
},
|
|
||||||
Human {
|
|
||||||
present_state: State::Infected,
|
|
||||||
x: 1,
|
|
||||||
y: 1,
|
|
||||||
},
|
|
||||||
Human {
|
|
||||||
present_state: State::Normal,
|
|
||||||
x: 2,
|
|
||||||
y: 1,
|
|
||||||
},
|
|
||||||
Human {
|
|
||||||
present_state: State::Normal,
|
|
||||||
x: 0,
|
|
||||||
y: 2,
|
|
||||||
},
|
|
||||||
Human {
|
|
||||||
present_state: State::Normal,
|
|
||||||
x: 1,
|
|
||||||
y: 2,
|
|
||||||
},
|
|
||||||
Human {
|
|
||||||
present_state: State::Normal,
|
|
||||||
x: 2,
|
|
||||||
y: 2,
|
|
||||||
},
|
|
||||||
];
|
|
||||||
stats = humans_stats(&population.humans);
|
|
||||||
println!("stats after init: {:?}", stats);
|
|
||||||
assert_eq!(stats.normal, 8);
|
|
||||||
|
|
||||||
// infect every one
|
|
||||||
propagate_stats = population.propagate();
|
|
||||||
stats = humans_stats(&population.humans);
|
|
||||||
println!("propate_stats: {:?}", propagate_stats);
|
|
||||||
println!("population: {:?}", stats);
|
|
||||||
assert_eq!(propagate_stats, [8, 1, 0, 0]);
|
|
||||||
assert_eq!(stats.normal, 0);
|
|
||||||
assert_eq!(stats.infected, 8);
|
|
||||||
assert_eq!(stats.immune, 1);
|
|
||||||
assert_eq!(stats.dead, 0);
|
|
||||||
|
|
||||||
// cure every one
|
|
||||||
propagate_stats = population.propagate();
|
|
||||||
stats = humans_stats(&population.humans);
|
|
||||||
println!("propate_stats: {:?}", propagate_stats);
|
|
||||||
println!("population: {:?}", stats);
|
|
||||||
assert_eq!(propagate_stats, [0, 8, 1, 0]);
|
|
||||||
assert_eq!(stats.normal, 0);
|
|
||||||
assert_eq!(stats.infected, 0);
|
|
||||||
assert_eq!(stats.immune, 9);
|
|
||||||
assert_eq!(stats.dead, 0);
|
|
||||||
|
|
||||||
// then
|
|
||||||
for _x in 0..100 {
|
|
||||||
propagate_stats = population.propagate();
|
|
||||||
stats = humans_stats(&population.humans);
|
|
||||||
println!("propate_stats: {:?}", propagate_stats);
|
|
||||||
println!("population: {:?}", stats);
|
|
||||||
assert_eq!(propagate_stats, [0, 0, 9, 0]);
|
|
||||||
assert_eq!(stats.normal, 0);
|
|
||||||
assert_eq!(stats.infected, 0);
|
|
||||||
assert_eq!(stats.immune, 9);
|
|
||||||
assert_eq!(stats.dead, 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[parameterized(infection_start = {0, 50, 100})]
|
|
||||||
fn propagate_harmless(infection_start: i32) {
|
|
||||||
let disease: Disease = Disease::new(0, 0, 0, String::from("Harmless"));
|
|
||||||
let (width, height) = (100, 100);
|
|
||||||
let mut population: Population = Population::new(infection_start, 0, 0, width, height, disease);
|
|
||||||
let stats_before: Stats;
|
|
||||||
let stats_after: Stats;
|
|
||||||
|
|
||||||
stats_before = humans_stats(&population.humans);
|
|
||||||
let should_be_infected = population.size as i32 * infection_start / 100;
|
|
||||||
let tolerance = (should_be_infected as f32 * 0.20) as i32;
|
|
||||||
println!("{:?}", stats_before);
|
|
||||||
assert!(stats_before.infected <= should_be_infected + tolerance, "{} infected, should be less than {}", stats_before.infected, should_be_infected + tolerance);
|
|
||||||
assert!(stats_before.infected >= should_be_infected - tolerance, "{} infected, should be more than {}", stats_before.infected, should_be_infected - tolerance);
|
|
||||||
|
|
||||||
population.propagate();
|
|
||||||
|
|
||||||
stats_after = humans_stats(&population.humans);
|
|
||||||
assert_eq!(stats_before.infected, stats_after.infected, "no one should have been infected");
|
|
||||||
}
|
|
||||||
|
|
||||||
#[parameterized(infection_rate = {0, 100, 0}, death_rate = {0, 0, 100}, infected_expected = {0, 1, 0})]
|
|
||||||
fn propagate_test(infection_rate: i32, death_rate: i32, infected_expected: i32) {
|
|
||||||
let disease: Disease;
|
|
||||||
let mut population: Population;
|
|
||||||
let mut stats: Stats;
|
|
||||||
let (width, height) = (100, 100);
|
|
||||||
let start_infected = 50;
|
|
||||||
|
|
||||||
println!(
|
|
||||||
"infection rate: {}, death_rate: {}",
|
|
||||||
infection_rate, death_rate
|
|
||||||
);
|
|
||||||
|
|
||||||
disease = Disease::new(infection_rate, 0, death_rate, String::from("Test"));
|
|
||||||
population = Population::new(start_infected, 0, 0, width, height, disease);
|
|
||||||
|
|
||||||
stats = humans_stats(&population.humans);
|
|
||||||
println!("Population after init: {:?}", stats);
|
|
||||||
|
|
||||||
// total * proba - 20% < infected < total * proba + 20%
|
|
||||||
let infected_at_start_proba = width * height * start_infected / 100;
|
|
||||||
let infected_tolerance = ((width * height) as f32 * 0.2) as i32;
|
|
||||||
assert!(stats.infected <= infected_at_start_proba + infected_tolerance);
|
|
||||||
assert!(stats.infected >= infected_at_start_proba - infected_tolerance);
|
|
||||||
assert_eq!(stats.dead, 0);
|
|
||||||
|
|
||||||
let infected_at_start = stats.infected;
|
|
||||||
let dead_at_start = stats.dead;
|
|
||||||
|
|
||||||
let propa_stats: [i32; 4] = population.propagate();
|
|
||||||
|
|
||||||
assert!(propa_stats[3] >= dead_at_start);
|
|
||||||
|
|
||||||
if death_rate == 0 {
|
|
||||||
assert_eq!(propa_stats[3], 0, "no human should have died");
|
|
||||||
}
|
|
||||||
|
|
||||||
stats = humans_stats(&population.humans);
|
|
||||||
println!("Population after propagate: {:?}", stats);
|
|
||||||
|
|
||||||
assert!(stats.infected <= infected_at_start + width * height * infected_expected);
|
|
||||||
|
|
||||||
let should_be_dead = infected_at_start * death_rate / 100;
|
|
||||||
let dead_tolerance = (should_be_dead as f32 * 0.20) as i32;
|
|
||||||
|
|
||||||
assert!(
|
|
||||||
stats.dead <= should_be_dead + dead_tolerance,
|
|
||||||
"death count should be less or equal than {}",
|
|
||||||
should_be_dead + dead_tolerance
|
|
||||||
);
|
|
||||||
assert!(stats.dead >= should_be_dead - dead_tolerance);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user