bert/adventofcode
1
0
Fork 0
mirror of https://github.com/bertptrs/adventofcode.git synced 2025-12-26 21:30:31 +01:00
Code Issues Projects Releases Wiki Activity

Move manhattan metric function to trait.

Browse Source
This commit is contained in:
Bert Peters
2018-12-22 09:40:09 +01:00
parent ba321caa37
commit 3b825ac933
5 changed files with 53 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
2018/src/day22.rs
View File

@@ -5,7 +5,7 @@ use std::io::BufRead;
use std::io::BufReader;
use std::io::Read;
use common::manhattan_distance;
use common::Point;
use common::Solution;
type Coordinate = (usize, usize);
@@ -107,7 +107,7 @@ impl Solution for Day22 {
let mut visited: HashSet<State> = HashSet::new();
let target_state = State { pos: target, climbing: false, torch: true };
todo.push((Reverse(manhattan_distance((0, 0), target)), Reverse(0), State { pos: (0, 0), climbing: false, torch: true }));
todo.push((Reverse((0, 0).manhattan(target)), Reverse(0), State { pos: (0, 0), climbing: false, torch: true }));
while let Some((Reverse(approx), Reverse(dist), state)) = todo.pop() {
if visited.contains(&state) {
@@ -147,7 +147,7 @@ impl Solution for Day22 {
};
if !visited.contains(&new_state) && new_state.is_valid(table[yn][xn]) && (x == xn || y == yn) {
todo.push((Reverse(dist + 1 + manhattan_distance(target, new_state.pos)), Reverse(dist + 1), new_state));
todo.push((Reverse(dist + 1 + target.manhattan(new_state.pos)), Reverse(dist + 1), new_state));
}
}
}