timw4mail
/
advent-of-code-2022
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve merge conflict

This commit is contained in:
Timothy Warren 2022-12-22 16:00:08 -05:00
parent da6b4c51bd
commit ecb2d67c5b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
day12/src/main.rs
View File

@ -24,7 +24,7 @@ impl Grid<char> {
self.vec.iter().position(|item| *item == value) self.vec.iter().position(|item| *item == value)
} }
fn print(&self) { pub fn print(&self) {
for r in 0usize..self.num_rows() { for r in 0usize..self.num_rows() {
let range = self.row_first_idx(r)..=self.row_last_idx(r); let range = self.row_first_idx(r)..=self.row_last_idx(r);
let line: String = self.vec[range].iter().collect(); let line: String = self.vec[range].iter().collect();
@ -79,7 +79,7 @@ impl Grid<char> {
} }
// Is the character a lowercase letter? // Is the character a lowercase letter?
let mut start_char = *start_char.unwrap(); let start_char = *start_char.unwrap();
let end_char = *end_char.unwrap(); let end_char = *end_char.unwrap();
if !(start_char.is_ascii_lowercase() && end_char.is_ascii_lowercase()) { if !(start_char.is_ascii_lowercase() && end_char.is_ascii_lowercase()) {
return false; return false;
@ -276,7 +276,7 @@ impl Pathfinder {
self.end_idx = end; self.end_idx = end;
self.grid.vec[start] = 'a'; self.grid.vec[start] = 'a';
self.grid.vec[end] = 'z'; self.grid.vec[end] = 'z';
self.grid.filter_invalid(start); // self.grid.filter_invalid(start);
self.tree.idx = start; self.tree.idx = start;
} }