check only normal people

src/population.rs

@@ -108,6 +108,8 @@ impl Population {
     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> =
@@ -120,6 +122,7 @@ impl Population {
         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;
                 }
                 State::Infected => {
@@ -150,75 +153,59 @@ impl Population {
                 }
             }
         }
-        for pos in self.humans.iter() {
-            if pos.present_state == State::Normal {
-                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,
-                    },
-                );
-                if infected {
-                    people_to_infect.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 });
             }
         }
-        // ); //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 roll(self.plague.infection_rate) {
-        //             people_to_infect.push(Point {
-        //                 x: poss_infected_pos.x,
-        //                 y: poss_infected_pos.y,
-        //             });
-        //         }
-        //     }
-        // }
 
         for infected_position in people_to_infect.iter() {
             // println!("To infect: {:?}", infected_position);