regroup initialization

src/main.rs

@@ -24,12 +24,13 @@ fn main() {
     println!("After Filling");
     //population.display();
     //population.display();
+    println!("After Propagation");
     let mut stats: [i32; 4];
     // = [0,0,0,0];
     let mut counter: u32 = 0;
     loop {
         counter += 1;
-        stats = population.propagate_new();
+        stats = population.propagate();
         //population.display();
         println!(
             "Normal: {} Infecteds: {} Immunes: {} Deads: {}",

src/population.rs

@@ -1,5 +1,11 @@
 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,
@@ -9,7 +15,6 @@ pub struct Population {
     pub height: i32,
     pub age: i32,
     pub plague: Disease,
-    pub size: usize,
 }
 
 pub fn human_idx(x: i32, y: i32, width: i32) -> usize {
@@ -27,30 +32,28 @@ impl Population {
     ) -> 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
+            (width * height) as usize
         ];
         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)
+                if (start_infected_ratio) > 0
+                    && (rng.gen_range(0..CORRECTED_PERCENTAGE) <= start_infected_ratio as i32)
                 {
                     present_state = State::Infected;
-                } else if (start_immune_ratio > 0)
-                    && (rng.gen_range(0..CORRECTED_PERCENTAGE) <= start_immune_ratio)
+                } else if start_immune_ratio > 0
+                    && rng.gen_range(0..CORRECTED_PERCENTAGE) <= start_immune_ratio as i32
                 {
                     present_state = State::Immune;
-                } else if (start_dead_ratio > 0)
-                    && (rng.gen_range(0..CORRECTED_PERCENTAGE) <= start_dead_ratio)
+                } else if start_dead_ratio > 0
+                    && rng.gen_range(0..CORRECTED_PERCENTAGE) <= start_dead_ratio as i32
                 {
                     present_state = State::Dead;
                 }
@@ -66,87 +69,192 @@ impl Population {
             plague: plague,
             age: 0,
             humans: the_humans,
-            size: size,
+        }
+    }
+    // pub fn change_disease(&mut self, plague:Disease){
+    //     self.plague = plague;
+    // }
+
+    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
         }
     }
 
-    pub fn propagate_new(&mut self) -> [i32; 4] {
+    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
+        }
+    }
+
+    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 possible_infected: Vec<Point> =
+            Vec::with_capacity((self.width * self.height) as usize);
+        let mut people_to_infect: Vec<Point> =
+            Vec::with_capacity((self.width * self.height) as usize);
+        let mut people_to_cure: Vec<Point> =
+            Vec::with_capacity((self.width * self.height) as usize);
+        let mut people_to_kill: Vec<Point> =
+            Vec::with_capacity((self.width * self.height) as usize);
         let mut stats: [i32; 4] = [0, 0, 0, 0];
-        let mut humans_n_plus_1: Vec<Human> = Vec::with_capacity(self.humans.len());
+        // stats[0] Normal stats[1] Infected stats[2] Immune stats[3] Dead
 
-        for human in self.humans.iter() {
-            let mut neighbors: Vec<&Human> = Vec::with_capacity(8);
-            if 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, self.width, self.height);
-                    match neigh_idx {
-                        Some(x) => neighbors.push(&self.humans[x]),
-                        None => {},
-                    }
-                }
-            }
-            let new_human = evolve(human, neighbors, self.plague.infection_rate, self.plague.curing_rate, self.plague.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);
-        }
-
-        self.humans = humans_n_plus_1;
-        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 {
+        for h in self.humans.iter() {
+            match h.present_state {
                 State::Normal => {
-            new_human.present_state = infect_by_neighbors(neighbors, infection_rate);
+                    possible_infected.push(Point{ x: h.x, y: h.y});
+                    stats[0] += 1;
                 }
                 State::Infected => {
-            new_human.present_state = die_or_cure(curing_rate, death_rate);
+                    people_to_check.push(Point { x: h.x, y: h.y });
+                    stats[1] += 1;
                 }
-        State::Immune => {}
-        State::Dead => {}
+                State::Immune => {
+                    stats[2] += 1;
                 }
-    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::Dead => {
+                    stats[3] += 1;
                 }
             }
         }
-    State::Normal
-}
-
-fn die_or_cure(curing_rate: i32, death_rate: i32) -> State {
-    if roll(curing_rate) {
-        State::Immune
-    } else if roll(death_rate) {
-        State::Dead
+        //        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 {
-        State::Infected
+                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 });
             }
         }
 
-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
+        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");
         }
+
+        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.humans.len() 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");
+    //     }
+    // }
 }
 
 pub fn roll(probability: i32) -> bool {
@@ -334,7 +442,7 @@ mod tests {
         assert_eq!(stats.infected, 100, "everybody should be infected");
 
         // kill every one
-        propagate_stats = population.propagate_new();
+        propagate_stats = population.propagate();
         stats = humans_stats(&population.humans);
         println!("propate_stats: {:?}", propagate_stats);
         assert_eq!(propagate_stats, [0, 100, 0, 0]);
@@ -344,7 +452,7 @@ mod tests {
         assert_eq!(stats.dead, 100);
 
         for _x in 0..100 {
-            propagate_stats = population.propagate_new();
+            propagate_stats = population.propagate();
             stats = humans_stats(&population.humans);
             println!("propate_stats: {:?}", propagate_stats);
             assert_eq!(propagate_stats, [0, 0, 0, 100]);
@@ -415,7 +523,7 @@ mod tests {
         assert_eq!(stats.normal, 8);
 
         // kill every one
-        propagate_stats = population.propagate_new();
+        propagate_stats = population.propagate();
         stats = humans_stats(&population.humans);
         println!("propate_stats: {:?}", propagate_stats);
         assert_eq!(propagate_stats, [8, 1, 0, 0]);
@@ -425,7 +533,7 @@ mod tests {
         assert_eq!(stats.dead, 0);
 
         for _x in 0..100 {
-            propagate_stats = population.propagate_new();
+            propagate_stats = population.propagate();
             stats = humans_stats(&population.humans);
             println!("propate_stats: {:?}", propagate_stats);
             assert_eq!(propagate_stats, [0, 9, 0, 0]);
@@ -496,7 +604,7 @@ mod tests {
         assert_eq!(stats.normal, 8);
 
         // infect every one
-        propagate_stats = population.propagate_new();
+        propagate_stats = population.propagate();
         stats = humans_stats(&population.humans);
         println!("propate_stats: {:?}", propagate_stats);
         println!("population: {:?}", stats);
@@ -507,7 +615,7 @@ mod tests {
         assert_eq!(stats.dead, 0);
 
         // cure every one
-        propagate_stats = population.propagate_new();
+        propagate_stats = population.propagate();
         stats = humans_stats(&population.humans);
         println!("propate_stats: {:?}", propagate_stats);
         println!("population: {:?}", stats);
@@ -519,7 +627,7 @@ mod tests {
 
         // then
         for _x in 0..100 {
-            propagate_stats = population.propagate_new();
+            propagate_stats = population.propagate();
             stats = humans_stats(&population.humans);
             println!("propate_stats: {:?}", propagate_stats);
             println!("population: {:?}", stats);
@@ -531,27 +639,6 @@ mod tests {
         }
     }
 
-    #[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_new();
-
-        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;
@@ -581,7 +668,7 @@ mod tests {
         let infected_at_start = stats.infected;
         let dead_at_start = stats.dead;
 
-        let propa_stats: [i32; 4] = population.propagate_new();
+        let propa_stats: [i32; 4] = population.propagate();
 
         assert!(propa_stats[3] >= dead_at_start);