smellyfis/AOC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2024 day-2 some code cleanup

Browse Source
This commit is contained in:
Dylan Thies
2024-12-02 10:16:57 -05:00
parent e9caeca48a
commit 426e548e30
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
2024/day-2/src/part1.rs
View File

@@ -1,6 +1,7 @@
#![warn(clippy::all, clippy::pedantic)] #![warn(clippy::all, clippy::pedantic)]
use error_stack::{Report, Result, ResultExt}; use error_stack::{Report, Result, ResultExt};
use itertools::Itertools;
use nom::{character::complete, multi::separated_list1, IResult}; use nom::{character::complete, multi::separated_list1, IResult};
use std::cmp::Ordering; use std::cmp::Ordering;
use thiserror::Error; use thiserror::Error;
@@ -19,11 +20,11 @@ struct XmasReport {
impl XmasReport { impl XmasReport {
pub fn is_safe(&self) -> Safety { pub fn is_safe(&self) -> Safety {
let mut dir = Ordering::Equal; let mut dir = Ordering::Equal;
for i in 1..self.levels.len() { for (a, b) in self.levels.iter().tuple_windows(){
if !(1_u32..=3).contains(&(self.levels[i - 1].abs_diff(self.levels[i]))) { if !(1_u32..=3).contains(&(a.abs_diff(*b))) {
return Safety::UnSafe; return Safety::UnSafe;
} }
let new_dir = self.levels[i - 1].cmp(&self.levels[i]); let new_dir = a.cmp(b);
if dir != Ordering::Equal && dir != new_dir { if dir != Ordering::Equal && dir != new_dir {
return Safety::UnSafe; return Safety::UnSafe;
} }

7
2024/day-2/src/part2.rs
View File

@@ -1,6 +1,7 @@
#![warn(clippy::all, clippy::pedantic)] #![warn(clippy::all, clippy::pedantic)]
use error_stack::{Report, Result, ResultExt}; use error_stack::{Report, Result, ResultExt};
use itertools::Itertools;
use nom::{character::complete, multi::separated_list1, IResult}; use nom::{character::complete, multi::separated_list1, IResult};
use std::cmp::Ordering; use std::cmp::Ordering;
use thiserror::Error; use thiserror::Error;
@@ -20,11 +21,11 @@ impl XmasReport {
pub fn is_safe(&self) -> Safety { pub fn is_safe(&self) -> Safety {
fn internal_check(levels: &[u32]) -> Safety { fn internal_check(levels: &[u32]) -> Safety {
let mut dir = Ordering::Equal; let mut dir = Ordering::Equal;
for i in 1..levels.len() { for (a, b) in levels.iter().tuple_windows() {
if !(1_u32..=3).contains(&(levels[i - 1].abs_diff(levels[i]))) { if !(1_u32..=3).contains(&(a.abs_diff(*b))) {
return Safety::UnSafe; return Safety::UnSafe;
} }
let new_dir = levels[i - 1].cmp(&levels[i]); let new_dir = a.cmp(b);
if dir != Ordering::Equal && dir != new_dir { if dir != Ordering::Equal && dir != new_dir {
return Safety::UnSafe; return Safety::UnSafe;
} }