dedpulicated coord checking

This commit is contained in:
max.nuding 2022-12-12 13:47:54 +01:00
parent 1c41e885ad
commit f2d6ff15e8
Failed to extract signature

View File

@ -77,48 +77,25 @@ fn bfs(map: &Vec<Vec<u8>>, start: Coord, target: Coord) -> Option<usize> {
if next == target { if next == target {
return Some(path_length); return Some(path_length);
} }
match make_coord((next.row as isize) + 1, next.col as isize, &map, &visited) { for coord in [(1, 0), (-1, 0), (0, 1), (0, -1)]
Some(down) if map[next.row][next.col] + 1 .iter()
>= map[down.row][down.col] => { .filter_map(|(dr, dc)|make_coord((next.row as isize) + dr, (next.col as isize) + dc, &map)) {
visited[down.row][down.col] = true; if map[next.row][next.col] + 1
queue.push_back((down, path_length + 1)); < map[coord.row][coord.col] || visited[coord.row][coord.col] {
}, continue;
_ => {} }
} visited[coord.row][coord.col] = true;
match make_coord((next.row as isize) - 1, next.col as isize, &map, &visited) { queue.push_back((coord, path_length + 1));
Some(up) if map[next.row][next.col] + 1
>= map[up.row][up.col] => {
visited[up.row][up.col] = true;
queue.push_back((up, path_length + 1));
},
_ => {}
}
match make_coord(next.row as isize, (next.col as isize) - 1, &map, &visited) {
Some(left) if map[next.row][next.col] + 1
>= map[left.row][left.col] => {
visited[left.row][left.col] = true;
queue.push_back((left, path_length + 1));
},
_ => {}
}
match make_coord(next.row as isize, (next.col as isize) + 1, &map, &visited) {
Some(right) if map[next.row][next.col] + 1
>= map[right.row][right.col] => {
visited[right.row][right.col] = true;
queue.push_back((right, path_length + 1));
},
_ => {}
} }
} }
None None
} }
fn make_coord(row: isize, col: isize, map: &Vec<Vec<u8>>, visited: &Vec<Vec<bool>>) -> Option<Coord> { fn make_coord(row: isize, col: isize, map: &Vec<Vec<u8>>) -> Option<Coord> {
if row >= 0 if row >= 0
&& col >= 0 && col >= 0
&& row < map.len() as isize && row < map.len() as isize
&& (col as usize) < map[row as usize].len() && (col as usize) < map[row as usize].len() {
&& !visited[row as usize][col as usize] {
Some(Coord { Some(Coord {
row: row as usize, row: row as usize,
col: col as usize col: col as usize