configurable width & height

Reviewed-on: Maxluli/RustyPropagation#1

Cargo.lock

@@ -2,12 +2,74 @@
 # 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"
@@ -40,6 +102,43 @@ dependencies = [
  "wasi",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+
+[[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.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee"
+dependencies = [
+ "autocfg",
+ "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.124"
@@ -52,12 +151,60 @@ 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 = "ppv-lite86"
 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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1"
+dependencies = [
+ "unicode-xid",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
+dependencies = [
+ "proc-macro2",
+]
+
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -107,10 +254,37 @@ checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
 name = "rusty_propagation"
 version = "0.1.0"
 dependencies = [
+ "clap",
  "console",
  "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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ff7c592601f11445996a06f8ad0c27f094a58857c2f89e97974ab9235b92c52"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "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"
@@ -121,12 +295,30 @@ 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"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
 
+[[package]]
+name = "unicode-xid"
+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"
@@ -149,6 +341,15 @@ 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"

Cargo.toml

@@ -5,4 +5,5 @@ edition = "2021"
 
 [dependencies]
 console = "0.15.0" 
-rand = "0.8.5" 
+rand = "0.8.5" 
+clap = { version = "3.1.15", features = ["derive"] }

ReadMe.md

@@ -0,0 +1,9 @@
+# Rusty Propagation
+Run : 
+```
+cargo run -q 
+```
+Speed run :
+```
+cargo run -q --release
+```

src/disease.rs

@@ -1,9 +1,10 @@
-use crate::prelude::*;
+// use crate::prelude::*;
 
 
-pub const MUTATION_TRAIT_INCREASE_PROBABILITY:i32 = 50;
+// pub const MUTATION_TRAIT_INCREASE_PROBABILITY:i32 = 50;
-pub const MUTATION_TRAIT_CHANGE_AMOUNT:i32 = 20;
+// pub const MUTATION_TRAIT_CHANGE_AMOUNT:i32 = 20;
 
+#[derive(Debug)]
 pub struct Disease {
     pub infection_rate:u32,
     pub curing_rate:u32,
@@ -21,21 +22,21 @@ impl Disease{
             traits : vec![infection_r,curing_r,death_r],
         }
     }
-    pub fn mutate(&mut self){
+    // pub fn mutate(&mut self){
-        let mut rng = rand::thread_rng();
+    //     let mut rng = rand::thread_rng();
-        for i in 0..self.traits.len(){
+    //     for i in 0..self.traits.len(){
-            let mut new_ratio:i32 = self.traits[i] as i32;
+    //         let mut new_ratio:i32 = self.traits[i] as i32;
 
-            if rng.gen_range(0..CORRECTED_PERCENTAGE) >= MUTATION_TRAIT_INCREASE_PROBABILITY{
+    //         if rng.gen_range(0..CORRECTED_PERCENTAGE) >= MUTATION_TRAIT_INCREASE_PROBABILITY{
-                new_ratio += MUTATION_TRAIT_CHANGE_AMOUNT;
+    //             new_ratio += MUTATION_TRAIT_CHANGE_AMOUNT;
-            }else{
+    //         }else{
-                new_ratio -= MUTATION_TRAIT_CHANGE_AMOUNT;
+    //             new_ratio -= MUTATION_TRAIT_CHANGE_AMOUNT;
-            }
+    //         }
-            if new_ratio < 0{
+    //         if new_ratio < 0{
-                new_ratio = 0;
+    //             new_ratio = 0;
-            }
+    //         }
-            new_ratio = new_ratio % CORRECTED_PERCENTAGE;
+    //         new_ratio = new_ratio % CORRECTED_PERCENTAGE;
-            self.traits[i] = new_ratio as u32;
+    //         self.traits[i] = new_ratio as u32;
-        }
+    //     }
-    }
+    // }
 }

src/human.rs

@@ -1,31 +1,33 @@
-use crate::prelude::*;
+// use crate::prelude::*;
 
-#[derive(Copy, Clone, PartialEq)]
+// #[derive(Copy, Clone, PartialEq)]
+#[derive(PartialEq)]
 pub enum State {
     Normal,
     Infected,
     Dead,
     Immune,
 }
-#[derive(Clone,Copy)]
+// #[derive(Clone)]
 pub struct Human {
     pub present_state : State,
     pub x : i32,
     pub y : i32,
 }
 impl Human{
-    pub fn new(state : State, pos_x :i32, pos_y :i32) -> Self{
+    // humans with state "Normal"
+    pub fn new(pos_x :i32, pos_y :i32) -> Self{
         Self{
-            present_state : state,
+            present_state : State::Normal,
             x : pos_x,
             y : pos_y
         }
     }
-    pub fn new_empty() -> Self{
+    // pub fn new_empty() -> Self{
-        Self{
+    //     Self{
-            present_state:State::Normal,
+    //         present_state:State::Normal,
-            x : 0,
+    //         x : 0,
-            y : 0,
+    //         y : 0,
-        }
+    //     }
-    }
+    // }
 }

src/main.rs

@@ -12,15 +12,32 @@ 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...");
     term.write_line("Press any key to start the propagation").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,300,300,disease);
+    let mut population = Population::new(20,10,5,args.width,args.height,disease);
     //population.change_disease(disease);
     println!("Before Filling");
     //population.display();
@@ -28,16 +45,20 @@ fn main() {
     println!("After Filling");
     //population.display();
     println!("After Propagation");
-    let mut stats: [i32;4] = [0,0,0,0];
+    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();
-        println!("Infecteds: {} Immunes: {} Deads: {}",stats[1],stats[2],stats[3]);
+        if args.display {
+            println!("Infecteds: {} Immunes: {} Deads: {}",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,49 +1,48 @@
 use crate::prelude::*;
 
+#[derive(Debug)]
 pub struct Point{
     x:i32,
     y:i32,
 }
 
 pub struct Population{
-    pub start_infected_ratio:i32,
+    pub start_infected_ratio:u32,
-    pub start_immune_ratio:i32,
+    pub start_immune_ratio:u32,
-    pub start_dead_ratio:i32,
+    pub start_dead_ratio:u32,
     pub humans:Vec<Human>,
     pub width:i32,
     pub height:i32,
     pub age:i32,
     pub plague:Disease,
 }
-pub fn human_idx(x: i32, y: i32,width:i32) -> usize {
+
+pub fn human_idx(x: i32, y: i32, width: i32) -> usize {
     ((y * width) + x)as usize
 }
+
 impl Population{
-    pub fn new(start_infected_ratio:u32,start_immune_ratio:u32,start_dead_ratio:u32,width:u32,height:u32,plague:Disease)->Self{
+    pub fn new(start_infected_ratio:u32,start_immune_ratio:u32,start_dead_ratio:u32,width:i32,height:i32,plague:Disease)->Self{
-        let mut the_humans:Vec<Human>;
+        let mut the_humans: Vec<Human> = Vec::with_capacity((width*height) as usize);
-        //we first fill the vector with empty humans to prevent any pointer to null
-        the_humans = vec![Human::new_empty();(width*height)as usize];
-        //this is not sufficient, every Human should know its position so ...
         for x in 0..width{
             for y in 0..height{
-                let index = human_idx(x as i32,y as i32,width as i32);
+                the_humans.push(Human::new(x, y));
-                the_humans[index] = Human::new(State::Normal, x as i32, y as i32);
             }
         }
         Self{
-            start_infected_ratio:start_infected_ratio as i32,
+            start_infected_ratio:start_infected_ratio,
-            start_immune_ratio:start_immune_ratio as i32,
+            start_immune_ratio:start_immune_ratio,
-            start_dead_ratio:start_dead_ratio as i32,
+            start_dead_ratio:start_dead_ratio,
-            width:width as i32,
+            width:width,
-            height:height as i32,
+            height:height,
             plague:plague,
             age:0,
             humans:the_humans,
         }
     }
-    pub fn change_disease(&mut self, plague:Disease){
+    // pub fn change_disease(&mut self, plague:Disease){
-        self.plague = plague;
+    //     self.plague = plague;
-    }
+    // }
     pub fn generate(&mut self){
         //The ratios will not be exact, for example someone who wants 100% infected 100% immune and 100% dead, he will have 100% dead because they are overwriting each others
         //Maybe consider limiting the total to not exceed 100 in the view
@@ -51,33 +50,43 @@ impl Population{
         //One solution to this issue would be to have if else else statements but in this case for example 20% would be lower with the last because its 20% on the remaining population and not of the all
         //In other words I did it that way but it can be changed just its not the right method to have perfect ratios
         let mut rng = rand::thread_rng();
-        
+        let mut i: i32 = 0;
-        for x in 0..self.width{
+        for x in self.humans.iter_mut() {
-            for y in 0..self.height{
+            if rng.gen_range(0..CORRECTED_PERCENTAGE) < self.start_infected_ratio as i32
-                let index = human_idx(x as i32,y as i32,self.width as i32);
+            {
-                if rng.gen_range(0..CORRECTED_PERCENTAGE) < self.start_infected_ratio as i32
+                x.present_state = State::Infected;
-                {
-                    self.humans[index].present_state = State::Infected;
-                }
-                if rng.gen_range(0..CORRECTED_PERCENTAGE) < self.start_immune_ratio as i32
-                {
-                    self.humans[index].present_state = State::Immune;
-                }
-                if rng.gen_range(0..CORRECTED_PERCENTAGE) < self.start_dead_ratio as i32
-                {
-                    self.humans[index].present_state = State::Dead;
-                }    
             }
+            if rng.gen_range(0..CORRECTED_PERCENTAGE) < self.start_immune_ratio as i32
+            {
+                x.present_state = State::Immune;
+            }
+            if rng.gen_range(0..CORRECTED_PERCENTAGE) < self.start_dead_ratio as i32
+            {
+                x.present_state = State::Dead;
+            }
+            i += 1;
         }
+        println!("generate for {} humans", i);
     }
     pub fn propagate(&mut self)->[i32;4]{
-        let mut people_to_check:Vec<Point> = Vec::new();
+        let mut people_to_check:Vec<Point> = Vec::with_capacity((self.width * self.height) as usize);
-        let mut people_to_infect:Vec<Point> = Vec::new();
+        let mut people_to_infect:Vec<Point> = Vec::with_capacity((self.width * self.height) as usize);
-        let mut people_to_cure:Vec<Point> = Vec::new();
+        let mut people_to_cure:Vec<Point> = Vec::with_capacity((self.width * self.height) as usize);
-        let mut people_to_kill:Vec<Point> = Vec::new();
+        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];
         // stats[0] Normal stats[1] Infected stats[2] Immune stats[3] Dead
 
+        /*
+        for h in self.humans.iter() {
+            match h.present_state{
+                State::Normal => {stats[0] += 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 x in 0..self.width{
             for y in 0..self.height{
                 let idx = human_idx(x as i32, y as i32, self.width as i32);
@@ -89,12 +98,14 @@ impl Population{
                 }
             }
         }
-        for pos in &people_to_check {
+
+        //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 pos.x > 0 && pos.x < self.width as i32 -1 && pos.y > 0 && pos.y < self.height as i32 -1{
+            if pos.x > 0 && pos.x < self.width - 1 && pos.y > 0 && pos.y < self.height -1 {
                 if self.roll(self.plague.curing_rate){
                     //checks if the man dies 
                     people_to_cure.push(Point{x:pos.x,y:pos.y});
@@ -103,7 +114,8 @@ impl Population{
                         //cheks if the man dies
                         people_to_kill.push(Point{x:pos.x,y:pos.y});
                     }else{
-                        let mut possible_infections:Vec<Point> = Vec::new();
+                        let mut possible_infections:Vec<Point> = Vec::with_capacity(8);
+                        // Vec::new();
                         //possible_infections.push(Point{x:pos.x,y:pos.y});
 
                         possible_infections.push(Point{x:pos.x -1,y:pos.y -1});     //Top Left
@@ -117,9 +129,9 @@ impl Population{
                         possible_infections.push(Point{x:pos.x,y:pos.y + 1});       //Bottom
                         possible_infections.push(Point{x:pos.x + 1,y:pos.y + 1});   //Bottom Right
 
-                        for poss_infected_pos in &possible_infections{
+                        for poss_infected_pos in possible_infections.iter() {
                         //possible_infections.iter().map(|poss_infected_pos|{
-                            let inf_idx = human_idx(poss_infected_pos.x as i32, poss_infected_pos.y as i32, self.width as i32);
+                            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 self.roll(self.plague.infection_rate){
                                     people_to_infect.push(Point{x:poss_infected_pos.x,y:poss_infected_pos.y});
@@ -169,29 +181,34 @@ impl Population{
                 //    ##@
             }
         };
-        for infected_position in &people_to_infect{
+        for infected_position in &people_to_infect {
+            // println!("To infect: {:?}", infected_position);
             //people_to_infect.iter().map(|infected_position|{
-                let infected_index = human_idx(infected_position.x as i32, infected_position.y as i32, self.width as i32);
+            let infected_index = human_idx(infected_position.x, infected_position.y, self.width);
-                //DEBUG
+            // let _ = infected_position.x;
-                //println!("x: {} y: {} index: {}",infected_position.x,infected_position.y,infected_index);
+            //DEBUG
-                self.humans[infected_index].present_state = State::Infected;
+            //println!("x: {} y: {} index: {}",infected_position.x,infected_position.y,infected_index);
-                //DEBUG
+            self.humans[infected_index].present_state = State::Infected;
-                //println!("Infected someone");
+            //DEBUG
-            };
+            //println!("Infected someone");
-            for cured_position in &people_to_cure{
+        };
-            //people_to_cure.iter().map(|cured_position|{
+
-                let cured_index = human_idx(cured_position.x as i32, cured_position.y as i32, self.width as i32);
+        for cured_position in &people_to_cure {
-                self.humans[cured_index].present_state = State::Immune;
+        //people_to_cure.iter().map(|cured_position|{
-                //DEBUG
+            let cured_index = human_idx(cured_position.x, cured_position.y, self.width);
-                //println!("Cured someone");
+            self.humans[cured_index].present_state = State::Immune;
-            };
+            //DEBUG
-            for dead_position in &people_to_kill{
+            //println!("Cured someone");
-            //people_to_kill.iter().map(|dead_position|{
+        };
-                let dead_index = human_idx(dead_position.x as i32, dead_position.y as i32, self.width as i32);
+
-                self.humans[dead_index].present_state = State::Dead;
+        for dead_position in &people_to_kill {
-                //DEBUG
+        //people_to_kill.iter().map(|dead_position|{
-                //println!("Killed someone");
+            let dead_index = human_idx(dead_position.x, dead_position.y, self.width);
-            };
+            self.humans[dead_index].present_state = State::Dead;
+            //DEBUG
+            //println!("Killed someone");
+        };
+
         stats
     }
     pub fn roll(&self,probability:u32)->bool{