configurable width & height

Cargo.lock

@@ -2,18 +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"
@@ -48,20 +104,41 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.9.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
+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.6.2"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3"
+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"
@@ -75,25 +152,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"
 
 [[package]]
-name = "parameterized"
+name = "os_str_bytes"
-version = "1.0.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33543d17fe882d6d8835b193d2c7f0fdc3317645ca7510aaaf6103848498381c"
+checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
-dependencies = [
- "parameterized-macro",
-]
-
-[[package]]
-name = "parameterized-macro"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24792407b50d07456abc531c1bc629a642a005d3b292c97dc23bf5bff1ad9cea"
-dependencies = [
- "indexmap",
- "proc-macro2",
- "quote",
- "syn",
-]
 
 [[package]]
 name = "ppv-lite86"
@@ -101,6 +163,30 @@ 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"
@@ -168,11 +254,17 @@ checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
 name = "rusty_propagation"
 version = "0.1.0"
 dependencies = [
+ "clap",
  "console",
- "parameterized",
  "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"
@@ -184,6 +276,15 @@ dependencies = [
  "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"
@@ -194,6 +295,12 @@ 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"
@@ -206,6 +313,12 @@ 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"
@@ -228,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

@@ -6,4 +6,4 @@ edition = "2021"
 [dependencies]
 console = "0.15.0" 
 rand = "0.8.5" 
-parameterized = "1.0.0"
+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::*;
 
+
 // pub const MUTATION_TRAIT_INCREASE_PROBABILITY:i32 = 50;
 // pub const MUTATION_TRAIT_CHANGE_AMOUNT:i32 = 20;
 
-// #[derive(Debug)]
+#[derive(Debug)]
 pub struct Disease {
     pub infection_rate:u32,
     pub curing_rate:u32,

src/human.rs

@@ -20,7 +20,7 @@ impl Human {
         Self{
             present_state : State::Normal,
             x : pos_x,
-            y: pos_y,
+            y : pos_y
         }
     }
     // pub fn new_empty() -> Self{

src/main.rs

@@ -1,27 +1,43 @@
-mod disease;
 mod human;
+mod disease;
 mod population;
 mod prelude {
-    pub use crate::disease::*;
     pub use crate::human::*;
+    pub use crate::disease::*;
     pub use crate::population::*;
-    pub use console::style;
-    pub use console::Term;
     pub use rand::Rng;
+    pub use console::Term;
+    pub use console::style;
     pub const CORRECTED_PERCENTAGE:i32 = 101;
 }
 
 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 **********")
+    term.write_line("********** Rusty Propagation (Console) 2022 **********").expect("Oops Looks like we have a problem here...");
-        .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...");
-    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();
@@ -32,18 +48,17 @@ 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();
         //population.display();
-        println!(
+        if args.display {
-            "Infecteds: {} Immunes: {} Deads: {}",
+            println!("Infecteds: {} Immunes: {} Deads: {}",stats[1],stats[2],stats[3]);
-            stats[1], stats[2], stats[3]
-        );
-        if stats[1] == 0 {
-            break;
         }
+        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,30 +1,11 @@
 use crate::prelude::*;
 
-// #[derive(Debug)]
+#[derive(Debug)]
 pub struct Point{
     x:i32,
     y:i32,
 }
 
-#[derive(Debug)]
-struct Stats {
-    normal: i32,
-    infected: i32,
-    immune: i32,
-    dead: i32,
-}
-
-impl Stats {
-    fn new() -> Stats {
-        Stats {
-            normal: 0,
-            infected: 0,
-            immune: 0,
-            dead: 0,
-        }
-    }
-}
-
 pub struct Population{
     pub start_infected_ratio:u32,
     pub start_immune_ratio:u32,
@@ -40,36 +21,8 @@ pub fn human_idx(x: i32, y: i32, width: i32) -> usize {
     ((y * width) + x)as usize
 }
 
-fn humans_stats(humans: &Vec<Human>) -> Stats {
-    let mut stats: Stats = Stats::new();
-    for human in humans.iter() {
-        match human.present_state {
-            State::Normal => {
-                stats.normal += 1;
-            }
-            State::Infected => {
-                stats.infected += 1;
-            }
-            State::Immune => {
-                stats.immune += 1;
-            }
-            State::Dead => {
-                stats.dead += 1;
-            }
-        }
-    }
-    stats
-}
-
 impl Population{
-    pub fn new(
+    pub fn new(start_infected_ratio:u32,start_immune_ratio:u32,start_dead_ratio:u32,width:i32,height:i32,plague:Disease)->Self{
-        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> = Vec::with_capacity((width*height) as usize);
         for x in 0..width{
             for y in 0..height{
@@ -97,53 +50,55 @@ 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 self.humans.iter_mut() {
-            if (self.start_infected_ratio) > 0
+            if rng.gen_range(0..CORRECTED_PERCENTAGE) < self.start_infected_ratio as i32
-                && (rng.gen_range(0..CORRECTED_PERCENTAGE) <= self.start_infected_ratio as i32)
             {
                 x.present_state = State::Infected;
-            } else if self.start_immune_ratio > 0
+            }
-                && rng.gen_range(0..CORRECTED_PERCENTAGE) <= self.start_immune_ratio as i32
+            if rng.gen_range(0..CORRECTED_PERCENTAGE) < self.start_immune_ratio as i32
             {
                 x.present_state = State::Immune;
-            } else if self.start_dead_ratio > 0
+            }
-                && rng.gen_range(0..CORRECTED_PERCENTAGE) <= self.start_dead_ratio as i32
+            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> =
+        let mut people_to_check:Vec<Point> = Vec::with_capacity((self.width * self.height) as usize);
-            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_infect: Vec<Point> =
+        let mut people_to_cure:Vec<Point> = Vec::with_capacity((self.width * self.height) as usize);
-            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 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];
         // stats[0] Normal stats[1] Infected stats[2] Immune stats[3] Dead
 
+        /*
         for h in self.humans.iter() {
             match h.present_state{
-                State::Normal => {
+                State::Normal => {stats[0] += 1;}
-                    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;}
             }
-                State::Infected => {
-                    people_to_check.push(Point { x: h.x, y: h.y });
-                    stats[1] += 1;
         }
-                State::Immune => {
+        */
-                    stats[2] += 1;
+
-                }
+        for x in 0..self.width{
-                State::Dead => {
+            for y in 0..self.height{
-                    stats[3] += 1;
+                let idx = human_idx(x as i32, y as i32, self.width as i32);
+                match self.humans[idx].present_state{
+                    State::Normal => {stats[0] += 1;}
+                    State::Infected => {people_to_check.push(Point{x:x,y: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|{
@@ -163,54 +118,26 @@ impl Population {
                         // Vec::new();
                         //possible_infections.push(Point{x:pos.x,y:pos.y});
 
-                        possible_infections.push(Point {
+                        possible_infections.push(Point{x:pos.x -1,y:pos.y -1});     //Top Left
-                            x: pos.x - 1,
+                        possible_infections.push(Point{x:pos.x,y:pos.y-1});         //Top
-                            y: pos.y - 1,
+                        possible_infections.push(Point{x:pos.x +1,y:pos.y -1});     //Top Right
-                        }); //Top Left
-                        possible_infections.push(Point {
-                            x: pos.x,
-                            y: pos.y - 1,
-                        }); //Top
-                        possible_infections.push(Point {
-                            x: pos.x + 1,
-                            y: pos.y - 1,
-                        }); //Top Right
 
-                        possible_infections.push(Point {
+                        possible_infections.push(Point{x:pos.x -1,y:pos.y});        //Left
-                            x: pos.x - 1,
+                        possible_infections.push(Point{x:pos.x +1,y:pos.y});        //Right
-                            y: pos.y,
-                        }); //Left
-                        possible_infections.push(Point {
-                            x: pos.x + 1,
-                            y: pos.y,
-                        }); //Right
 
-                        possible_infections.push(Point {
+                        possible_infections.push(Point{x:pos.x -1,y:pos.y + 1});    //Bottom Left
-                            x: pos.x - 1,
+                        possible_infections.push(Point{x:pos.x,y:pos.y + 1});       //Bottom
-                            y: pos.y + 1,
+                        possible_infections.push(Point{x:pos.x + 1,y:pos.y + 1});   //Bottom Right
-                        }); //Bottom Left
-                        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.iter() {
                         //possible_infections.iter().map(|poss_infected_pos|{
-                            let inf_idx =
+                            let inf_idx = human_idx(poss_infected_pos.x, poss_infected_pos.y, self.width);
-                                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 {
+                                    people_to_infect.push(Point{x:poss_infected_pos.x,y:poss_infected_pos.y});
-                                        x: poss_infected_pos.x,
-                                        y: poss_infected_pos.y,
-                                    });
-                                }
                                 }
                             }
+                        };
                     }
                 }
             }else{
@@ -253,13 +180,7 @@ impl Population {
                 //    ###
                 //    ##@
             }
-        }
+        };
-        println!(
-            "{} to infect, {} to cure, {} to kill",
-            people_to_infect.len(),
-            people_to_cure.len(),
-            people_to_kill.len()
-        );
         for infected_position in &people_to_infect {
             // println!("To infect: {:?}", infected_position);
             //people_to_infect.iter().map(|infected_position|{
@@ -270,7 +191,7 @@ impl Population {
             self.humans[infected_index].present_state = State::Infected;
             //DEBUG
             //println!("Infected someone");
-        }
+        };
 
         for cured_position in &people_to_cure {
         //people_to_cure.iter().map(|cured_position|{
@@ -278,191 +199,37 @@ impl Population {
             self.humans[cured_index].present_state = State::Immune;
             //DEBUG
             //println!("Cured someone");
-        }
+        };
 
         for dead_position in &people_to_kill {
         //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
-        }
+            //println!("Killed someone");
+        };
+
         stats
     }
     pub fn roll(&self,probability:u32)->bool{
         let mut rng = rand::thread_rng();
         rng.gen_range(0..CORRECTED_PERCENTAGE) <= probability as i32
     } 
-    // pub fn display(&mut self){
+    pub fn display(&mut self){
-    //     let sprite = "#";
+        let sprite = "#";
-    //     print!("\n");
+        print!("\n");
-    //     for x in 0..self.width{
+        for x in 0..self.width{
-    //         for y in 0..self.height{
+            for y in 0..self.height{
-    //             let index = human_idx(x as i32,y as i32,self.width as i32);
+                let index = human_idx(x as i32,y as i32,self.width as i32);
-    //             match self.humans[index].present_state {
+                match self.humans[index].present_state {
-    //                 State::Normal => print!("{}",style(sprite).green()),
+                    State::Normal => print!("{}",style(sprite).green()),
-    //                 State::Dead => print!("{}",style(sprite).black()),
+                    State::Dead => print!("{}",style(sprite).black()),
-    //                 State::Infected => print!("{}",style(sprite).red()),
+                    State::Infected => print!("{}",style(sprite).red()),
-    //                 State::Immune => print!("{}",style(sprite).blue()),
+                    State::Immune => print!("{}",style(sprite).blue()),
-    //                 _ => print!("{}",style(sprite).white()),
+                    _ => print!("{}",style(sprite).white()),
-    //             }
-    //         }
-    //         print!("\n");
-    //     }
-    // }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use parameterized::parameterized;
-
-    #[parameterized(x = {
-        2, 3, 5
-    }, y = {
-        1, 4, 0
-    }, width = {
-        3, 5, 7
-    }, res = {
-        5, 23, 5
-    })]
-    fn test_human_idx(x: i32, y: i32, width: i32, res: usize) {
-        assert_eq!(human_idx(x, y, width), res);
-    }
-
-    #[test]
-    fn test_human_stats() {
-        let mut humans: Vec<Human> = Vec::with_capacity(10);
-        let mut stats: Stats;
-
-        for _ in 0..10 {
-            humans.push(Human::new(0, 0));
-        }
-        stats = humans_stats(&humans);
-        assert_eq!(stats.normal, 10);
-
-        for x in 0..2 {
-            humans[x].present_state = State::Infected;
-        }
-        for x in 2..5 {
-            humans[x].present_state = State::Immune;
-        }
-        for x in 5..9 {
-            humans[x].present_state = State::Dead;
-        }
-        stats = humans_stats(&humans);
-        assert_eq!(stats.normal, 1);
-        assert_eq!(stats.infected, 2);
-        assert_eq!(stats.immune, 3);
-        assert_eq!(stats.dead, 4);
-    }
-
-    #[test]
-    fn population_new() {
-        let disease = Disease::new(20, 10, 5, String::from("Covid 44"));
-        let population = Population::new(20, 10, 5, 5, 7, disease);
-        assert_eq!(population.humans.len(), 5 * 7);
-        for human in population.humans.iter() {
-            assert!(
-                human.present_state == State::Normal,
-                "all humans should be normal"
-            );
                 }
             }
-
+            print!("\n");
-    #[test]
+        }     
-    fn population_gen() {
-        let disease = Disease::new(20, 10, 5, String::from("Covid 44"));
-        let (width, height) = (5, 7);
-        let mut population = Population::new(20, 10, 5, 5, 7, disease);
-
-        population.generate();
-        let stats: Stats = humans_stats(&population.humans);
-        println!("Stats: {:?}", stats);
-
-        assert_eq!(
-            stats.normal + stats.infected + stats.immune + stats.dead,
-            width * height
-        );
-    }
-
-    #[test]
-    fn plague_init_stats() {
-        let mut disease: Disease;
-        let mut population: Population;
-        let mut stats: Stats;
-        let (width, height) = (5, 7);
-
-        disease = Disease::new(0, 0, 0, String::from("Test"));
-        population = Population::new(0, 0, 0, width, height, disease);
-        population.generate();
-        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);
-        population.generate();
-        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);
-        population.generate();
-        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);
-        population.generate();
-        stats = humans_stats(&population.humans);
-        println!("should be dead: {:?}", stats);
-        assert_eq!(stats.dead, width * height);
-    }
-
-    #[parameterized(infection_rate = {0, 100, 0}, death_rate = {0, 0, 100}, infected_expected = {0, 1, 1})]
-    fn propage_test(
-        infection_rate: u32,
-        death_rate: u32,
-        infected_expected: i32,
-    ) {
-        let disease: Disease;
-        let mut population: Population;
-        let mut stats: Stats;
-        let (width, height) = (100, 100);
-        let start_infected = 50;
-
-        println!("infection rate: {}, death_rate: {}", infection_rate, death_rate);
-
-        disease = Disease::new(infection_rate, 0, death_rate, String::from("Test"));
-        population = Population::new(start_infected, 0, 0, width, height, disease);
-
-        population.generate();
-        stats = humans_stats(&population.humans);
-        println!("Population after generate: {:?}", stats);
-
-        // total * proba - 20% < infected < total * proba + 20%
-        let infected_at_start = width * height * start_infected as i32 / 100;
-        let infected_tolerance = ((width * height) as f32 * 0.2) as i32;
-        assert!(stats.infected < infected_at_start + infected_tolerance);
-        assert!(stats.infected > infected_at_start - infected_tolerance);
-        assert_eq!(stats.dead, 0);
-
-        population.propagate();
-        stats = humans_stats(&population.humans);
-        println!("Population after propagate: {:?}", stats);
-
-        assert!(stats.normal <= infected_at_start + width * height * infected_expected);
-
-        let should_be_dead = infected_at_start * death_rate as i32 / 100;
-        let dead_tolerance = (should_be_dead as f32 * 0.20) as i32;
-
-        assert!(stats.dead < should_be_dead + dead_tolerance);
-        assert!(stats.dead > should_be_dead - dead_tolerance);
     }
 }