use mutex for stats instead of yield at the end

src/main.rs

@@ -13,12 +13,22 @@ mod prelude {
 
 use prelude::*;
 use clap::Parser;
+use std::time::Instant;
 
 #[derive(Parser, Debug)]
 struct Args {
     /// Number of threads
     #[clap(short, long, default_value_t = 1)]
     threads: usize,
+    /// 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() {
@@ -29,7 +39,7 @@ fn main() {
         .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, 1000, 1000, disease);
+    let mut population = Population::new(20,10,5,args.width,args.height,disease);
     //population.change_disease(disease);
     println!("After Filling");
     //population.display();
@@ -37,18 +47,21 @@ 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_new(Some(args.threads));
         //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);
+    println!("Propagation finished in {} steps, {:?}", counter, now.elapsed());
     //population.display();
 }

src/population.rs

@@ -1,5 +1,6 @@
 
 use std::sync::Arc;
+use std::sync::Mutex;
 use std::thread;
 use crate::prelude::*;
 
@@ -78,10 +79,10 @@ impl Population {
         let len = humans.len();
 
         let mut humans_n_plus_1: Vec<Human> = Vec::with_capacity(len);
-        let mut stats: [i32; 4] = [0, 0, 0, 0];
+        let stats: [i32; 4] = [0, 0, 0, 0];
 
         let num_threads = num_threads.unwrap_or(1);
-        if num_threads > 8 {
+        if num_threads > 48 {
             panic!("too many threads")
         }
 
@@ -93,6 +94,8 @@ impl Population {
 
         let mut threads = vec![];
 
+        let stats_arc = Arc::new(Mutex::new(stats));
+
         for x in 0..num_threads {
 
             // find items to process
@@ -104,6 +107,7 @@ impl Population {
 
             // borrow copies of data for thread
             let humans = Arc::clone(&self.humans);
+            let stats = Arc::clone(&stats_arc);
             let (width, height, infection_rate, curing_rate, death_rate) = 
             (self.width, self.height, self.plague.infection_rate, self.plague.curing_rate, self.plague.death_rate);
 
@@ -112,12 +116,13 @@ impl Population {
                 // no write on data
                 // let humans = humans;
                 let mut humans_n_plus_1: Vec<Human> = Vec::with_capacity(num_items);
-                let mut stats: [i32; 4] = [0, 0, 0, 0];
 
                 for idx in lower_bound..upper_bound {
                     let human = &humans[idx];
-                    let mut neighbors: Vec<&Human> = Vec::with_capacity(8);
-                    if human.present_state == State::Normal {
+                    // let mut neighbors: Vec<&Human> = Vec::with_capacity(8);
+                    let mut new_human = human.clone();
+                    match human.present_state {
+                        State::Normal => {
                             let possible = [
                                 (human.x - 1, human.y - 1), (human.x, human.y - 1), (human.x + 1, human.y - 1),
                                 (human.x - 1, human.y)    ,                         (human.x + 1, human.y),
@@ -126,70 +131,63 @@ impl Population {
                             for neigh_coords in possible.iter() {
                                 let neigh_idx = point_to_index(neigh_coords.0, neigh_coords.1, width, height);
                                 match neigh_idx {
-                                Some(x) => neighbors.push(&humans[x]),
-                                None => {},
+                                    Some(x) => if humans[x].present_state == State::Infected {
+                                        if roll(infection_rate) {
+                                            new_human.present_state = State::Infected;
+                                            break;
                                         }
                                     }
+                                    None => {}
+                                }
+                            }
+                            let mut stats = stats.lock().unwrap();
+                            stats[0] += 1;
+                        }
+                        State::Infected => {
+                            match die_or_cure(curing_rate, death_rate) {
+                                Some(x) => new_human.present_state = x,
+                                None => {}
+                            }
+                            let mut stats = stats.lock().unwrap();
+                            stats[1] += 1;
+                        }
+                        State::Immune => {
+                            let mut stats = stats.lock().unwrap();
+                            stats[2] += 1;
+                        }
+                        State::Dead => {
+                            let mut stats = stats.lock().unwrap();
+                            stats[3] += 1;
                         }
-                    let new_human = evolve(human, neighbors, infection_rate, curing_rate, death_rate);
-                    match human.present_state {
-                        State::Normal => { stats[0] += 1; }
-                        State::Infected => { stats[1] += 1; }
-                        State::Immune => { stats[2] += 1; }
-                        State::Dead => { stats[3] += 1; }
                     }
                     humans_n_plus_1.push(new_human);
                 }
-                (humans_n_plus_1, stats)
+                (humans_n_plus_1,)
             }));
         }
 
         for t in threads {
             let mut res = t.join().unwrap();
             humans_n_plus_1.append(&mut res.0);
-            for x in 0..4 {
-                stats[x] += res.1[x];
-            }
+            // for x in 0..4 {
+            //     stats[x] += res.1[x];
+            // }
         }
 
         self.humans = Arc::new(humans_n_plus_1);
+        let stats = Arc::clone(&stats_arc);
+        let stats = *stats.lock().unwrap();
         stats
     }
 }
 
-fn evolve(human: &Human, neighbors: Vec<&Human>, infection_rate: i32, curing_rate: i32, death_rate: i32) -> Human {
-    let mut new_human = human.clone();
-    match human.present_state {
-        State::Normal => {
-            new_human.present_state = infect_by_neighbors(neighbors, infection_rate);
-        }
-        State::Infected => {
-            new_human.present_state = die_or_cure(curing_rate, death_rate);
-        }
-        State::Immune => {}
-        State::Dead => {}
-    }
-    new_human
-}
-
-fn infect_by_neighbors(neighbors: Vec<&Human>, infection_rate: i32) -> State {
-    for neighbor in neighbors.iter() {
-        if neighbor.present_state == State::Infected {
-            if roll(infection_rate) {
-                return State::Infected;
-            }
-        }
-    }
-    State::Normal
-}
-
-fn die_or_cure(curing_rate: i32, death_rate: i32) -> State {
+fn die_or_cure(curing_rate: i32, death_rate: i32) -> Option<State> {
     if roll(curing_rate) {
-        State::Immune
+        Some(State::Immune)
     } else if roll(death_rate) {
-        State::Dead
+        Some(State::Dead)
     } else {
-        State::Infected
+        None
     }
 }
 
@@ -201,7 +199,7 @@ fn point_to_index(x: i32, y: i32, width: i32, height: i32) -> Option<usize> {
     }
 }
 
-pub fn roll(probability: i32) -> bool {
+fn roll(probability: i32) -> bool {
     if probability > 0 {
         let mut rng = rand::thread_rng();
         rng.gen_range(0..CORRECTED_PERCENTAGE) <= probability