configurable width & height

Cargo.lock

@@ -141,9 +141,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.124"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50"
+checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b"
 
 [[package]]
 name = "once_cell"

src/main.rs

@@ -17,9 +17,6 @@ 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,
@@ -50,7 +47,7 @@ fn main() {
     let now = Instant::now();
     loop {
         counter += 1;
-        stats = population.propagate_new(Some(args.threads));
+        stats = population.propagate();
         //population.display();
         if args.display {
             println!(

src/population.rs

@@ -1,14 +1,16 @@
-
-use std::sync::Arc;
-use std::sync::Mutex;
-use std::thread;
 use crate::prelude::*;
 
+#[derive(Debug)]
+pub struct Point {
+    x: i32,
+    y: i32,
+}
+
 pub struct Population {
     pub start_infected_ratio: i32,
     pub start_immune_ratio: i32,
     pub start_dead_ratio: i32,
-    pub humans: Arc<Vec<Human>>,
+    pub humans: Vec<Human>,
     pub width: i32,
     pub height: i32,
     pub age: i32,
@@ -69,137 +71,197 @@ impl Population {
             height: height,
             plague: plague,
             age: 0,
-            humans: Arc::new(the_humans),
+            humans: the_humans,
             size: size,
         }
     }
+    // pub fn change_disease(&mut self, plague:Disease){
+    //     self.plague = plague;
+    // }
 
-    pub fn propagate_new(&mut self, num_threads: Option<usize>) -> [i32; 4] {
-        let humans = Arc::clone(&self.humans);
-        let len = humans.len();
-
-        let mut humans_n_plus_1: Vec<Human> = Vec::with_capacity(len);
-        let stats: [i32; 4] = [0, 0, 0, 0];
-
-        let num_threads = num_threads.unwrap_or(1);
-        if num_threads > 48 {
-            panic!("too many threads")
+    fn is_inside(&self, pos: &Point) -> bool {
+        if pos.x >= 0 && pos.x < self.width && pos.y >= 0 && pos.y < self.height {
+            true
+        } else {
+            false
         }
+    }
 
-        // number of items per batch
-        let mut num_items = (len / num_threads) as usize;
-        if len % num_threads != 0 {
-            num_items += 1;
+    fn is_inside_and_infected(&self, point: Point) -> bool {
+        if self.is_inside(&point) {
+            let idx = human_idx(point.x, point.y, self.width);
+            if self.humans[idx].present_state == State::Infected {
+                roll(self.plague.infection_rate)
+            } else {
+                false
+            }
+        } else {
+            false
         }
+    }
 
-        let mut threads = vec![];
+    pub fn propagate(&mut self) -> [i32; 4] {
+        let mut people_to_check: Vec<Point> =
+            Vec::with_capacity(self.size);
+        let mut possible_infected: Vec<Point> =
+            Vec::with_capacity(self.size);
+        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
 
-        let stats_arc = Arc::new(Mutex::new(stats));
-
-        for x in 0..num_threads {
-
-            // find items to process
-            let lower_bound = x * num_items;
-            let mut upper_bound = (x + 1) * num_items;
-            if upper_bound > len {
-                upper_bound = len;
-            };
-
-            // 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);
-
-            threads.push(thread::spawn(move || {
-
-                // no write on data
-                // let humans = humans;
-                let mut humans_n_plus_1: Vec<Human> = Vec::with_capacity(num_items);
-
-                for idx in lower_bound..upper_bound {
-                    let human = &humans[idx];
-                    // 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),
-                                (human.x - 1, human.y + 1), (human.x, human.y + 1), (human.x + 1, human.y + 1),
-                            ];
-                            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) => 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;
-                        }
-                    }
-                    humans_n_plus_1.push(new_human);
+        for h in self.humans.iter() {
+            match h.present_state {
+                State::Normal => {
+                    possible_infected.push(Point{ x: h.x, y: h.y});
+                    stats[0] += 1;
                 }
-                (humans_n_plus_1,)
-            }));
+                State::Infected => {
+                    people_to_check.push(Point { x: h.x, y: h.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.iter() {
+            //people_to_check.iter().map(|pos|{
+            //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
+            //let idx = human_idx(pos.x as i32, pos.y as i32, self.width as i32);
+            if roll(self.plague.curing_rate) {
+                //checks if the man recovers
+                people_to_cure.push(Point { x: pos.x, y: pos.y });
+            } else {
+                if roll(self.plague.death_rate) {
+                    //cheks if the man dies
+                    people_to_kill.push(Point { x: pos.x, y: pos.y });
+                }
+            }
+        }
+        for pos in possible_infected.iter() {
+            let infected: bool = self.is_inside_and_infected(
+                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 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 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");
         }
 
-        self.humans = Arc::new(humans_n_plus_1);
-        let stats = Arc::clone(&stats_arc);
-        let stats = *stats.lock().unwrap();
+        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 {
+                println!("not infected");
+            }
+            self.humans[cured_index].present_state = State::Immune;
+            //DEBUG
+            //println!("Cured someone");
+        }
+
+        for dead_position in people_to_kill.iter() {
+            //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 {
+                // println!("Already dead");
+            } else {
+                self.humans[dead_index].present_state = State::Dead;
+            }
+            //DEBUG
+        }
+        assert_eq!(
+            stats[0] + stats[1] + stats[2] + stats[3],
+            self.size as i32
+        );
         stats
     }
+
+    // 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");
+    //     }
+    // }
 }
 
-fn die_or_cure(curing_rate: i32, death_rate: i32) -> Option<State> {
-    if roll(curing_rate) {
-        Some(State::Immune)
-    } else if roll(death_rate) {
-        Some(State::Dead)
-    } else {
-        None
-    }
-}
-
-fn point_to_index(x: i32, y: i32, width: i32, height: i32) -> Option<usize> {
-    if (x >= 0) && (x < width) && (y >= 0) && (y < height) {
-        Some(human_idx(x, y, width))
-    } else {
-        None
-    }
-}
-
-fn roll(probability: i32) -> bool {
+pub fn roll(probability: i32) -> bool {
     if probability > 0 {
         let mut rng = rand::thread_rng();
         rng.gen_range(0..CORRECTED_PERCENTAGE) <= probability
@@ -213,8 +275,6 @@ mod tests {
     use super::*;
     use parameterized::parameterized;
 
-    const THREADS: Option<usize> = Some(4);
-
     #[derive(Debug)]
     struct Stats {
         normal: i32,
@@ -303,14 +363,14 @@ mod tests {
     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, width, height, disease);
-        let humans = Arc::clone(&population.humans);
-        assert_eq!(humans.len(), 5 * 7);
-        for h in humans.iter() {
+        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!(humans[idx].x, h.x, "coordinates should match");
-            assert_eq!(humans[idx].y, h.y, "coordinates should match");
+            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]
@@ -319,8 +379,7 @@ mod tests {
         let (width, height) = (5, 7);
         let population = Population::new(20, 10, 5, 5, 7, disease);
 
-        let humans = Arc::clone(&population.humans);
-        let stats: Stats = humans_stats(&humans);
+        let stats: Stats = humans_stats(&population.humans);
         println!("Stats: {:?}", stats);
 
         assert_eq!(
@@ -338,29 +397,25 @@ mod tests {
 
         disease = Disease::new(0, 0, 0, String::from("Test"));
         population = Population::new(0, 0, 0, width, height, disease);
-        let humans = Arc::clone(&population.humans);
-        stats = humans_stats(&humans);
+        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);
-        let humans = Arc::clone(&population.humans);
-        stats = humans_stats(&humans);
+        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);
-        let humans = Arc::clone(&population.humans);
-        stats = humans_stats(&humans);
+        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);
-        let humans = Arc::clone(&population.humans);
-        stats = humans_stats(&humans);
+        stats = humans_stats(&population.humans);
         println!("should be dead: {:?}", stats);
         assert_eq!(stats.dead, width * height);
     }
@@ -386,15 +441,13 @@ mod tests {
         let mut propagate_stats: [i32; 4];
 
         // infect every one
-        let humans = Arc::clone(&population.humans);
-        stats = humans_stats(&humans);
+        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_new(THREADS);
-        let humans = Arc::clone(&population.humans);
-        stats = humans_stats(&humans);
+        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);
@@ -403,9 +456,8 @@ mod tests {
         assert_eq!(stats.dead, 100);
 
         for _x in 0..100 {
-            propagate_stats = population.propagate_new(THREADS);
-            let humans = Arc::clone(&population.humans);
-            stats = humans_stats(&humans);
+            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);
@@ -423,7 +475,7 @@ mod tests {
         let mut propagate_stats: [i32; 4];
 
         // start with normal population
-        population.humans = Arc::new(vec![
+        population.humans = vec![
             Human {
                 present_state: State::Normal,
                 x: 0,
@@ -469,16 +521,14 @@ mod tests {
                 x: 2,
                 y: 2,
             },
-        ]);
-        let humans = Arc::clone(&population.humans);
-        stats = humans_stats(&humans);
+        ];
+        stats = humans_stats(&population.humans);
         println!("stats after init: {:?}", stats);
         assert_eq!(stats.normal, 8);
 
         // kill every one
-        propagate_stats = population.propagate_new(THREADS);
-        let humans = Arc::clone(&population.humans);
-        stats = humans_stats(&humans);
+        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);
@@ -487,9 +537,8 @@ mod tests {
         assert_eq!(stats.dead, 0);
 
         for _x in 0..100 {
-            propagate_stats = population.propagate_new(THREADS);
-            let humans = Arc::clone(&population.humans);
-            stats = humans_stats(&humans);
+            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);
@@ -507,7 +556,7 @@ mod tests {
         let mut propagate_stats: [i32; 4];
 
         // start with normal population
-        population.humans = Arc::new(vec![
+        population.humans = vec![
             Human {
                 present_state: State::Normal,
                 x: 0,
@@ -553,16 +602,14 @@ mod tests {
                 x: 2,
                 y: 2,
             },
-        ]);
-        let humans = Arc::clone(&population.humans);
-        stats = humans_stats(&humans);
+        ];
+        stats = humans_stats(&population.humans);
         println!("stats after init: {:?}", stats);
         assert_eq!(stats.normal, 8);
 
         // infect every one
-        propagate_stats = population.propagate_new(THREADS);
-        let humans = Arc::clone(&population.humans);
-        stats = humans_stats(&humans);
+        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]);
@@ -572,9 +619,8 @@ mod tests {
         assert_eq!(stats.dead, 0);
 
         // cure every one
-        propagate_stats = population.propagate_new(THREADS);
-        let humans = Arc::clone(&population.humans);
-        stats = humans_stats(&humans);
+        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]);
@@ -585,9 +631,8 @@ mod tests {
 
         // then
         for _x in 0..100 {
-            propagate_stats = population.propagate_new(THREADS);
-            let humans = Arc::clone(&population.humans);
-            stats = humans_stats(&humans);
+            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]);
@@ -606,18 +651,16 @@ mod tests {
         let stats_before: Stats;
         let stats_after: Stats;
 
-        let humans = Arc::clone(&population.humans);
-        stats_before = humans_stats(&humans);
+        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_new(THREADS);
+        population.propagate();
 
-        let humans = Arc::clone(&population.humans);
-        stats_after = humans_stats(&humans);
+        stats_after = humans_stats(&population.humans);
         assert_eq!(stats_before.infected, stats_after.infected, "no one should have been infected");
     }
 
@@ -637,8 +680,7 @@ mod tests {
         disease = Disease::new(infection_rate, 0, death_rate, String::from("Test"));
         population = Population::new(start_infected, 0, 0, width, height, disease);
 
-        let humans = Arc::clone(&population.humans);
-        stats = humans_stats(&humans);
+        stats = humans_stats(&population.humans);
         println!("Population after init: {:?}", stats);
 
         // total * proba - 20% < infected < total * proba + 20%
@@ -651,7 +693,7 @@ mod tests {
         let infected_at_start = stats.infected;
         let dead_at_start = stats.dead;
 
-        let propa_stats: [i32; 4] = population.propagate_new(THREADS);
+        let propa_stats: [i32; 4] = population.propagate();
 
         assert!(propa_stats[3] >= dead_at_start);
 
@@ -659,8 +701,7 @@ mod tests {
             assert_eq!(propa_stats[3], 0, "no human should have died");
         }
 
-        let humans = Arc::clone(&population.humans);
-        stats = humans_stats(&humans);
+        stats = humans_stats(&population.humans);
         println!("Population after propagate: {:?}", stats);
 
         assert!(stats.infected <= infected_at_start + width * height * infected_expected);