diff --git a/aoc-5/src/main.rs b/aoc-5/src/main.rs index 052660e..257c7f6 100644 --- a/aoc-5/src/main.rs +++ b/aoc-5/src/main.rs @@ -2,8 +2,8 @@ use std::fs; use regex::Regex; fn main() { println!("Lets begin, day 5"); - // let file_path = "src/input.txt"; - let file_path = "src/example.txt"; + let file_path = "src/input.txt"; + // let file_path = "src/example.txt"; let re = Regex::new(r"(?\d*)-(?\d*)").unwrap(); let mut ranges: Vec<(i64, i64)> = Vec::new(); @@ -82,9 +82,12 @@ fn main() { let mut last_end = -1; //? for mut range in &mut ranges{ - if range.0 < last_end{ + if range.0 <= last_end{ range.0 = last_end + 1; } + if range.1 <= last_end{ + range.1 = last_end; + } last_end = range.1; } @@ -106,6 +109,7 @@ fn main() { // too low: 330684820916269 // too high: 348115621205555 + // too high: 348115621205536 <-- off by one } diff --git a/readme.md b/readme.md index 866a20c..87dd95d 100644 --- a/readme.md +++ b/readme.md @@ -4,10 +4,10 @@ This year I'll be trying to do it in Rust ### 2026 Calendar ``` 1 2 3 4 5 6 -[**] [**] [**] [**] [* ] [ ] +[**] [**] [**] [**] [**] [ ] 7 8 9 10 11 12 [ ] [ ] [ ] [ ] [ ] [ ] -~~ < 9/24 Stars Collected > ~~ +~~ < 10/24 Stars Collected > ~~ ``` \ No newline at end of file