forked from Maxluli/RustyPropagation
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 herel
|
ea74e1029b |
Generated
+2
-146
@@ -2,74 +2,18 @@
|
||||
# It is not intended for manual editing.
|
||||
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]]
|
||||
name = "cfg-if"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
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]]
|
||||
name = "console"
|
||||
version = "0.15.0"
|
||||
@@ -108,21 +52,6 @@ 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"
|
||||
@@ -133,17 +62,11 @@ dependencies = [
|
||||
"hashbrown",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "lazy_static"
|
||||
version = "1.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.125"
|
||||
version = "0.2.124"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b"
|
||||
checksum = "21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50"
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
@@ -151,12 +74,6 @@ version = "1.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
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"
|
||||
@@ -184,30 +101,6 @@ version = "0.2.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
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"
|
||||
@@ -275,18 +168,11 @@ checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
|
||||
name = "rusty_propagation"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"console",
|
||||
"parameterized",
|
||||
"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"
|
||||
@@ -298,15 +184,6 @@ dependencies = [
|
||||
"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]]
|
||||
name = "terminal_size"
|
||||
version = "0.1.17"
|
||||
@@ -317,12 +194,6 @@ dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "textwrap"
|
||||
version = "0.15.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-width"
|
||||
version = "0.1.9"
|
||||
@@ -335,12 +206,6 @@ 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]]
|
||||
name = "wasi"
|
||||
version = "0.10.2+wasi-snapshot-preview1"
|
||||
@@ -363,15 +228,6 @@ version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
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]]
|
||||
name = "winapi-x86_64-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
|
||||
@@ -7,4 +7,3 @@ edition = "2021"
|
||||
console = "0.15.0"
|
||||
rand = "0.8.5"
|
||||
parameterized = "1.0.0"
|
||||
clap = { version = "3.1.15", features = ["derive"] }
|
||||
|
||||
+2
-22
@@ -12,31 +12,14 @@ mod 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() {
|
||||
let args = Args::parse();
|
||||
|
||||
let term = Term::stdout();
|
||||
term.write_line("********** Rusty Propagation (Console) 2022 **********")
|
||||
.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 mut population = Population::new(20, 10, 5, 1000, 1000, disease);
|
||||
//population.change_disease(disease);
|
||||
println!("After Filling");
|
||||
//population.display();
|
||||
@@ -44,21 +27,18 @@ fn main() {
|
||||
let mut stats: [i32; 4];
|
||||
// = [0,0,0,0];
|
||||
let mut counter: u32 = 0;
|
||||
let now = Instant::now();
|
||||
loop {
|
||||
counter += 1;
|
||||
stats = population.propagate();
|
||||
//population.display();
|
||||
if args.display {
|
||||
println!(
|
||||
"Normal: {} Infecteds: {} Immunes: {} Deads: {}",
|
||||
stats[0], stats[1], stats[2], stats[3]
|
||||
);
|
||||
}
|
||||
if stats[1] == 0 {
|
||||
break;
|
||||
}
|
||||
}
|
||||
println!("Propagation finished in {} steps, {:?}", counter, now.elapsed());
|
||||
println!("Propagation finished in {} steps", counter);
|
||||
//population.display();
|
||||
}
|
||||
|
||||
+59
-26
@@ -1,4 +1,8 @@
|
||||
use std::sync::Arc;
|
||||
use std::sync::Mutex;
|
||||
use crate::prelude::*;
|
||||
use std::thread;
|
||||
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct Point {
|
||||
@@ -10,7 +14,7 @@ pub struct Population {
|
||||
pub start_infected_ratio: i32,
|
||||
pub start_immune_ratio: i32,
|
||||
pub start_dead_ratio: i32,
|
||||
pub humans: Vec<Human>,
|
||||
pub humans: Arc<Mutex<Vec<Human>>>,
|
||||
pub width: i32,
|
||||
pub height: i32,
|
||||
pub age: i32,
|
||||
@@ -35,14 +39,15 @@ impl Population {
|
||||
|
||||
let size: usize = (width * height) as usize;
|
||||
|
||||
let mut the_humans: Vec<Human> = vec![
|
||||
let the_humans_arc = Arc::new(Mutex::new(vec![
|
||||
Human {
|
||||
x: 0,
|
||||
y: 0,
|
||||
present_state: State::Normal
|
||||
};
|
||||
size
|
||||
];
|
||||
]));
|
||||
let the_humans = Arc::clone(&the_humans_arc);
|
||||
for x in 0..width {
|
||||
for y in 0..height {
|
||||
let idx = human_idx(x, y, width);
|
||||
@@ -60,7 +65,7 @@ impl Population {
|
||||
{
|
||||
present_state = State::Dead;
|
||||
}
|
||||
the_humans[idx] = Human{x: x, y: y, present_state: present_state};
|
||||
the_humans.lock().unwrap()[idx] = Human{x: x, y: y, present_state: present_state};
|
||||
}
|
||||
}
|
||||
Self {
|
||||
@@ -71,7 +76,7 @@ impl Population {
|
||||
height: height,
|
||||
plague: plague,
|
||||
age: 0,
|
||||
humans: the_humans,
|
||||
humans: the_humans_arc,
|
||||
size: size,
|
||||
}
|
||||
}
|
||||
@@ -88,9 +93,11 @@ impl Population {
|
||||
}
|
||||
|
||||
fn is_inside_and_infected(&self, point: Point) -> bool {
|
||||
let the_humans_arc = Arc::clone(&self.humans);
|
||||
if self.is_inside(&point) {
|
||||
let idx = human_idx(point.x, point.y, self.width);
|
||||
if self.humans[idx].present_state == State::Infected {
|
||||
let humans = the_humans_arc.lock().unwrap();
|
||||
if humans[idx].present_state == State::Infected {
|
||||
roll(self.plague.infection_rate)
|
||||
} else {
|
||||
false
|
||||
@@ -114,7 +121,8 @@ impl Population {
|
||||
let mut stats: [i32; 4] = [0, 0, 0, 0];
|
||||
// stats[0] Normal stats[1] Infected stats[2] Immune stats[3] Dead
|
||||
|
||||
for h in self.humans.iter() {
|
||||
let humans = Arc::clone(&self.humans);
|
||||
for h in humans.lock().unwrap().iter() {
|
||||
match h.present_state {
|
||||
State::Normal => {
|
||||
possible_infected.push(Point{ x: h.x, y: h.y});
|
||||
@@ -202,36 +210,60 @@ impl Population {
|
||||
}
|
||||
}
|
||||
|
||||
// for infected_position in people_to_infect.iter() {
|
||||
// // println!("To infect: {:?}", infected_position);
|
||||
// //people_to_infect.iter().map(|infected_position|{
|
||||
// let infected_index = human_idx(infected_position.x, infected_position.y, self.width);
|
||||
// // let _ = infected_position.x;
|
||||
// //DEBUG
|
||||
// //println!("x: {} y: {} index: {}",infected_position.x,infected_position.y,infected_index);
|
||||
// self.humans[infected_index].present_state = State::Infected;
|
||||
// //DEBUG
|
||||
// //println!("Infected someone");
|
||||
// }
|
||||
|
||||
let mut threads = vec![];
|
||||
{
|
||||
let humans = Arc::clone(&self.humans);
|
||||
let width = self.width;
|
||||
threads.push(thread::spawn(move || {
|
||||
for infected_position in people_to_infect.iter() {
|
||||
// println!("To infect: {:?}", infected_position);
|
||||
//people_to_infect.iter().map(|infected_position|{
|
||||
let infected_index = human_idx(infected_position.x, infected_position.y, self.width);
|
||||
// let _ = infected_position.x;
|
||||
//DEBUG
|
||||
//println!("x: {} y: {} index: {}",infected_position.x,infected_position.y,infected_index);
|
||||
self.humans[infected_index].present_state = State::Infected;
|
||||
//DEBUG
|
||||
//println!("Infected someone");
|
||||
let infected_index = human_idx(infected_position.x, infected_position.y, width);
|
||||
humans.lock().unwrap()[infected_index].present_state = State::Infected;
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
{
|
||||
let humans = Arc::clone(&self.humans);
|
||||
let width = self.width;
|
||||
threads.push(thread::spawn(move || {
|
||||
for cured_position in people_to_cure.iter() {
|
||||
//people_to_cure.iter().map(|cured_position|{
|
||||
let cured_index = human_idx(cured_position.x, cured_position.y, self.width);
|
||||
if self.humans[cured_index].present_state != State::Infected {
|
||||
let cured_index = human_idx(cured_position.x, cured_position.y, width);
|
||||
if humans.lock().unwrap()[cured_index].present_state != State::Infected {
|
||||
println!("not infected");
|
||||
} else {
|
||||
humans.lock().unwrap()[cured_index].present_state = State::Immune;
|
||||
}
|
||||
self.humans[cured_index].present_state = State::Immune;
|
||||
//DEBUG
|
||||
//println!("Cured someone");
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
for t in threads {
|
||||
t.join().unwrap();
|
||||
}
|
||||
|
||||
for dead_position in people_to_kill.iter() {
|
||||
let humans = Arc::clone(&self.humans);
|
||||
//people_to_kill.iter().map(|dead_position|{
|
||||
let dead_index = human_idx(dead_position.x, dead_position.y, self.width);
|
||||
if self.humans[dead_index].present_state == State::Dead {
|
||||
if humans.lock().unwrap()[dead_index].present_state == State::Dead {
|
||||
// println!("Already dead");
|
||||
} else {
|
||||
self.humans[dead_index].present_state = State::Dead;
|
||||
humans.lock().unwrap()[dead_index].present_state = State::Dead;
|
||||
}
|
||||
//DEBUG
|
||||
}
|
||||
@@ -364,13 +396,14 @@ mod tests {
|
||||
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 humans = Arc::clone(&population.humans);
|
||||
assert_eq!(humans.lock().unwrap().len(), 5 * 7);
|
||||
for h in humans.lock().unwrap().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!(humans.lock().unwrap()[idx].x, h.x, "coordinates should match");
|
||||
assert_eq!(humans.lock().unwrap()[idx].y, h.y, "coordinates should match");
|
||||
}
|
||||
assert_eq!(population.humans.len(), (width * height) as usize);
|
||||
assert_eq!(humans.lock().unwrap().len(), (width * height) as usize);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
Reference in New Issue
Block a user