LeMoonStar/AoC24
1
0
Fork 1
mirror of https://github.com/LeMoonStar/AoC24.git synced 2025-07-07 21:49:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

🚧 Day 2: Still broken, but hopefully better Part 2

Browse source
This commit is contained in:
LeMoonStar 2024-12-02 17:43:05 +01:00
parent b397d625c8
commit e1e9051ccb
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/days/d02.rs
View file

@ -11,8 +11,7 @@ pub enum Direction {
pub struct Report(Vec<i8>); pub struct Report(Vec<i8>);
impl Report { impl Report {
pub fn is_safe(&self, mut tolerance: usize) -> bool { pub fn is_safe(&self, mut direction: Option<Direction>, mut tolerance: usize) -> bool {
let mut direction = None;
let mut skip = false; let mut skip = false;
for i in 1..self.0.len() { for i in 1..self.0.len() {
@ -22,9 +21,9 @@ impl Report {
} }
if !Self::safe_comparison(self.0[i - 1], self.0[i], &mut direction) { if !Self::safe_comparison(self.0[i - 1], self.0[i], &mut direction) {
if tolerance > 0 && i > 1 { if tolerance > 0 && i + 1 < self.0.len() {
tolerance -= 1; tolerance -= 1;
if !Self::safe_comparison(self.0[i - 2], self.0[i], &mut direction) { if !Self::safe_comparison(self.0[i - 1], self.0[i + 1], &mut direction) {
skip = true; skip = true;
continue; continue;
} }
@ -37,6 +36,15 @@ impl Report {
true true
} }
/**
* It is possible that the second number is out of place, causing the
* direction to be wrong.
*/
pub fn is_safe_any_way(&self, tolerance: usize) -> bool {
return self.is_safe(Some(Direction::Decreasing), tolerance)
|| self.is_safe(Some(Direction::Increasing), tolerance);
}
fn safe_comparison(a: i8, b: i8, direction: &mut Option<Direction>) -> bool { fn safe_comparison(a: i8, b: i8, direction: &mut Option<Direction>) -> bool {
match (b - a, &direction) { match (b - a, &direction) {
/* Over limits */ /* Over limits */
@ -87,7 +95,7 @@ impl DayImpl<Data> for Day<CURRENT_DAY> {
fn one(&self, data: &mut Data) -> Answer { fn one(&self, data: &mut Data) -> Answer {
let mut safe_count = 0; let mut safe_count = 0;
for report in data { for report in data {
if report.is_safe(0) { if report.is_safe(None, 0) {
safe_count += 1; safe_count += 1;
} }
} }
@ -98,7 +106,7 @@ impl DayImpl<Data> for Day<CURRENT_DAY> {
fn two(&self, data: &mut Data) -> Answer { fn two(&self, data: &mut Data) -> Answer {
let mut safe_count = 0; let mut safe_count = 0;
for report in data { for report in data {
if report.is_safe(1) { if report.is_safe_any_way(1) {
safe_count += 1; safe_count += 1;
} }
} }