From a1080587d1d585a7dcc4270a3f13fdfa7c8465b8 Mon Sep 17 00:00:00 2001 From: EliasCubz Date: Sat, 31 Oct 2020 23:10:41 +0100 Subject: [PATCH 1/7] add fn display_grid skeleton --- niktoi | 2 ++ src/main.rs | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 niktoi diff --git a/niktoi b/niktoi new file mode 100644 index 0000000..2bb9559 --- /dev/null +++ b/niktoi @@ -0,0 +1,2 @@ +niktoi + diff --git a/src/main.rs b/src/main.rs index 6609ca7..9fee27b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -198,6 +198,22 @@ fn open_file(filename: &str) -> io::Result { Ok(content) } +fn display_grid(h: HashMap<>, ){ + for (i=0;j + match robot_pool[id-1].o { + "N" => println!("fleche du haut"), + "E" => println!("fleche a droite"), + "W" => println!("fleche a gauche"), + "S" => println!("fleche en bas"), + + }, + None => println!("."), + + } + } +} fn main() -> Result<(), Box> { // We handle CLI flags here. let matches = App::new("DancingDroids") From c0f0a92a76ace76af9e390db0c2198d6cfe526d6 Mon Sep 17 00:00:00 2001 From: EliasCubz Date: Sun, 1 Nov 2020 15:49:02 +0100 Subject: [PATCH 2/7] declaration of display grid --- src/main.rs | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/src/main.rs b/src/main.rs index 9fee27b..3c1f9f8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -198,19 +198,26 @@ fn open_file(filename: &str) -> io::Result { Ok(content) } -fn display_grid(h: HashMap<>, ){ - for (i=0;j - match robot_pool[id-1].o { - "N" => println!("fleche du haut"), - "E" => println!("fleche a droite"), - "W" => println!("fleche a gauche"), - "S" => println!("fleche en bas"), - +fn display_grid( + w: &world::World, + robot_pool: &Vec, + h: &HashMap, +) { + for i in (0..w.y).rev() { + + print!(" "); + for j in 0..w.x { + print!("{} ", i); + match h.get(Position{ x: j, y: i }) { + some(id) => match robot_pool[(id - 1) as usize].o { + robot::Orientation::N => print!("↑"), + robot::Orientation::E => print!("→"), + robot::Orientation::S => print!("↓"), + robot::Orientation::W => print!("←"), + None => print!("."), }, - None => println!("."), - + } + println!() } } } From 58a0e5a1a7da8899d80bb4c27e2d8c4b5a11850e Mon Sep 17 00:00:00 2001 From: EliasCubz Date: Sun, 1 Nov 2020 15:55:06 +0100 Subject: [PATCH 3/7] added print of orthonormal --- src/main.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main.rs b/src/main.rs index 3c1f9f8..0e92f5e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -204,8 +204,7 @@ fn display_grid( h: &HashMap, ) { for i in (0..w.y).rev() { - - print!(" "); + print!("{} ", i); for j in 0..w.x { print!("{} ", i); match h.get(Position{ x: j, y: i }) { @@ -217,8 +216,12 @@ fn display_grid( None => print!("."), }, } - println!() } + println!(); + } + print!(" "); + for j in (0..w.x){ + print!("{} ", j); } } fn main() -> Result<(), Box> { From 7b3bdbfa116df255953c5b6f05858f098bf6a834 Mon Sep 17 00:00:00 2001 From: EliasCubz Date: Sun, 1 Nov 2020 16:04:33 +0100 Subject: [PATCH 4/7] corrected some major minor errors haha --- src/main.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main.rs b/src/main.rs index 0e92f5e..15ad453 100644 --- a/src/main.rs +++ b/src/main.rs @@ -206,22 +206,22 @@ fn display_grid( for i in (0..w.y).rev() { print!("{} ", i); for j in 0..w.x { - print!("{} ", i); - match h.get(Position{ x: j, y: i }) { - some(id) => match robot_pool[(id - 1) as usize].o { + match h.get(&robot::Position { x: j, y: i }) { + Some(id) => match robot_pool[(id - 1) as usize].o { robot::Orientation::N => print!("↑"), robot::Orientation::E => print!("→"), robot::Orientation::S => print!("↓"), robot::Orientation::W => print!("←"), - None => print!("."), }, + + None => print!("."), } } println!(); } print!(" "); - for j in (0..w.x){ - print!("{} ", j); + for j in 0..w.x { + print!("{} ", j); } } fn main() -> Result<(), Box> { From e884ff6e9b9c744e50518f4e0ad05d61e61f1a33 Mon Sep 17 00:00:00 2001 From: EliasCubz Date: Sun, 1 Nov 2020 16:21:27 +0100 Subject: [PATCH 5/7] added doc and minor changes to have a better grid --- src/main.rs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main.rs b/src/main.rs index 15ad453..e8f06c0 100644 --- a/src/main.rs +++ b/src/main.rs @@ -198,6 +198,7 @@ fn open_file(filename: &str) -> io::Result { Ok(content) } +///Here we display the grid by looping in every position checking if it exists in the HashMap. fn display_grid( w: &world::World, robot_pool: &Vec, @@ -208,21 +209,22 @@ fn display_grid( for j in 0..w.x { match h.get(&robot::Position { x: j, y: i }) { Some(id) => match robot_pool[(id - 1) as usize].o { - robot::Orientation::N => print!("↑"), - robot::Orientation::E => print!("→"), - robot::Orientation::S => print!("↓"), - robot::Orientation::W => print!("←"), + robot::Orientation::N => print!("↑ "), + robot::Orientation::E => print!("→ "), + robot::Orientation::S => print!("↓ "), + robot::Orientation::W => print!("← "), }, - None => print!("."), + None => print!(". "), } } println!(); } - print!(" "); + print!(" "); for j in 0..w.x { print!("{} ", j); } + println!(); } fn main() -> Result<(), Box> { // We handle CLI flags here. @@ -244,7 +246,7 @@ fn main() -> Result<(), Box> { let world: world::World = parse_config(raw_conf, &mut robot_pool)?; let mut hash: HashMap = HashMap::new(); create_hash_map(&robot_pool, &mut hash); - + display_grid(&world, &robot_pool, &hash); loop { let mut piouff: u32 = 0; for r in &mut robot_pool { From 6d8d1f47b60b986440cb314ab8be151a8e9392ec Mon Sep 17 00:00:00 2001 From: EliasCubz Date: Sun, 1 Nov 2020 16:40:27 +0100 Subject: [PATCH 6/7] added a Whitespace line 201 --- niktoi | 2 -- 1 file changed, 2 deletions(-) diff --git a/niktoi b/niktoi index 2bb9559..e69de29 100644 --- a/niktoi +++ b/niktoi @@ -1,2 +0,0 @@ -niktoi - From 8c139e29d27d93f33561e5d7c3ac15f9b3921dd4 Mon Sep 17 00:00:00 2001 From: EliasCubz Date: Sun, 1 Nov 2020 16:45:51 +0100 Subject: [PATCH 7/7] oops --- niktoi | 0 src/main.rs | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 niktoi diff --git a/niktoi b/niktoi deleted file mode 100644 index e69de29..0000000 diff --git a/src/main.rs b/src/main.rs index e8f06c0..d49505f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -198,7 +198,7 @@ fn open_file(filename: &str) -> io::Result { Ok(content) } -///Here we display the grid by looping in every position checking if it exists in the HashMap. +/// Here we display the grid by looping in every position checking if it exists in the HashMap. fn display_grid( w: &world::World, robot_pool: &Vec,