fiplox
/
dancing_droids
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix-check-map' into 'master' 

fixed check_map()

See merge request mhart/DancingDroids!37
This commit is contained in:
Martin HART 2020-10-30 16:05:35 +01:00
parent d2058ef71d f4dde09370
commit 392aaf8fd1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main.rs
View File

@ -23,7 +23,7 @@ mod world;
/// Check if the robot is in the map. /// Check if the robot is in the map.
fn check_map(r: &robot::Robot, w: &world::World) -> Result<(), String> { fn check_map(r: &robot::Robot, w: &world::World) -> Result<(), String> {
if (r.p.x, r.p.y) < (0, 0) || (r.p.x, r.p.y) > (w.x, w.y) { if r.p.x < 0 || r.p.y < 0 || r.p.x > w.x || r.p.y > w.y {
Err(format!("The robot {} is off map", r.id)) Err(format!("The robot {} is off map", r.id))
} else { } else {
Ok(()) Ok(())
@ -129,10 +129,10 @@ mod tests {
let mut r = robot::Robot::new( let mut r = robot::Robot::new(
0, 0,
robot::Orientation::N, robot::Orientation::N,
robot::Position { x: 2, y: 3 }, robot::Position { x: 2, y: 4 },
vec!['F'], vec!['F'],
); );
let w = world::World { x: 1, y: 1 }; let w = world::World { x: 3, y: 3 };
assert!(check_map(&r, &w).is_ok()); assert!(check_map(&r, &w).is_ok());
} }