diff --git a/Cargo.toml b/Cargo.toml index 63147f6..91123ca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,4 +11,3 @@ incremental = true rpath = true [dependencies] -nom = "7.1.1" diff --git a/prob5_part1.txt b/prob5_part1.txt deleted file mode 100644 index ed6656b..0000000 --- a/prob5_part1.txt +++ /dev/null @@ -1,511 +0,0 @@ -[B] [N] [H] -[V] [P] [T] [V] [P] -[W] [C] [T] [S] [H] [N] -[T] [J] [Z] [M] [N] [F] [L] -[Q] [W] [N] [J] [T] [Q] [R] [B] -[N] [B] [Q] [R] [V] [F] [D] [F] [M] -[H] [W] [S] [J] [P] [W] [L] [P] [S] -[D] [D] [T] [F] [G] [B] [B] [H] [Z] - 1 2 3 4 5 6 7 8 9 - -move 2 from 8 to 1 -move 4 from 9 to 8 -move 2 from 1 to 6 -move 7 from 4 to 2 -move 10 from 2 to 7 -move 2 from 1 to 6 -move 1 from 9 to 4 -move 1 from 4 to 1 -move 8 from 6 to 4 -move 7 from 1 to 8 -move 6 from 8 to 1 -move 1 from 4 to 1 -move 8 from 7 to 3 -move 2 from 5 to 2 -move 5 from 3 to 2 -move 5 from 2 to 1 -move 1 from 6 to 5 -move 2 from 2 to 6 -move 5 from 8 to 7 -move 12 from 7 to 4 -move 3 from 5 to 4 -move 2 from 6 to 4 -move 9 from 1 to 7 -move 4 from 3 to 7 -move 4 from 3 to 4 -move 3 from 1 to 7 -move 1 from 9 to 1 -move 1 from 1 to 4 -move 2 from 5 to 2 -move 1 from 3 to 7 -move 15 from 7 to 2 -move 4 from 7 to 9 -move 6 from 9 to 2 -move 2 from 8 to 3 -move 3 from 2 to 8 -move 1 from 7 to 6 -move 8 from 2 to 5 -move 2 from 8 to 4 -move 2 from 3 to 8 -move 9 from 5 to 9 -move 7 from 4 to 2 -move 1 from 8 to 6 -move 6 from 9 to 2 -move 3 from 9 to 7 -move 2 from 8 to 4 -move 7 from 2 to 6 -move 7 from 4 to 1 -move 3 from 1 to 8 -move 2 from 1 to 8 -move 4 from 8 to 2 -move 2 from 1 to 5 -move 19 from 2 to 7 -move 8 from 4 to 7 -move 18 from 7 to 1 -move 11 from 7 to 4 -move 15 from 1 to 7 -move 9 from 4 to 3 -move 2 from 3 to 1 -move 9 from 4 to 5 -move 1 from 8 to 1 -move 8 from 6 to 5 -move 3 from 2 to 5 -move 1 from 6 to 7 -move 4 from 4 to 3 -move 8 from 5 to 1 -move 13 from 1 to 6 -move 12 from 7 to 1 -move 12 from 6 to 3 -move 1 from 7 to 6 -move 1 from 7 to 5 -move 1 from 1 to 9 -move 1 from 3 to 1 -move 3 from 1 to 9 -move 12 from 3 to 8 -move 1 from 9 to 3 -move 1 from 6 to 8 -move 5 from 5 to 1 -move 1 from 6 to 2 -move 10 from 8 to 9 -move 13 from 9 to 2 -move 10 from 3 to 4 -move 1 from 8 to 9 -move 2 from 8 to 7 -move 1 from 3 to 1 -move 1 from 5 to 6 -move 13 from 2 to 5 -move 1 from 9 to 2 -move 7 from 1 to 4 -move 2 from 2 to 5 -move 2 from 7 to 8 -move 1 from 6 to 8 -move 10 from 5 to 8 -move 3 from 7 to 2 -move 4 from 1 to 4 -move 12 from 4 to 2 -move 10 from 5 to 3 -move 6 from 2 to 1 -move 2 from 4 to 8 -move 3 from 4 to 8 -move 6 from 1 to 7 -move 1 from 7 to 5 -move 12 from 8 to 2 -move 3 from 4 to 9 -move 1 from 4 to 3 -move 2 from 9 to 6 -move 2 from 6 to 8 -move 1 from 1 to 3 -move 8 from 2 to 6 -move 4 from 1 to 8 -move 12 from 2 to 3 -move 4 from 6 to 8 -move 10 from 8 to 3 -move 14 from 3 to 8 -move 5 from 5 to 8 -move 1 from 7 to 8 -move 5 from 3 to 5 -move 4 from 7 to 2 -move 2 from 6 to 1 -move 4 from 3 to 7 -move 4 from 5 to 1 -move 21 from 8 to 6 -move 7 from 3 to 2 -move 1 from 5 to 1 -move 4 from 8 to 9 -move 16 from 6 to 1 -move 1 from 8 to 4 -move 5 from 9 to 2 -move 7 from 1 to 7 -move 10 from 1 to 3 -move 1 from 4 to 2 -move 6 from 6 to 5 -move 6 from 1 to 4 -move 4 from 7 to 9 -move 1 from 6 to 5 -move 5 from 7 to 6 -move 3 from 6 to 8 -move 1 from 7 to 6 -move 6 from 4 to 8 -move 4 from 8 to 3 -move 4 from 8 to 4 -move 17 from 2 to 1 -move 8 from 3 to 4 -move 5 from 4 to 3 -move 10 from 1 to 5 -move 11 from 3 to 5 -move 1 from 7 to 9 -move 3 from 6 to 4 -move 9 from 4 to 9 -move 7 from 1 to 3 -move 1 from 4 to 8 -move 7 from 5 to 4 -move 18 from 5 to 1 -move 13 from 1 to 6 -move 1 from 1 to 5 -move 1 from 1 to 6 -move 2 from 3 to 1 -move 1 from 3 to 1 -move 5 from 1 to 6 -move 4 from 5 to 8 -move 2 from 4 to 9 -move 1 from 1 to 9 -move 6 from 3 to 8 -move 1 from 4 to 5 -move 10 from 8 to 7 -move 16 from 6 to 7 -move 1 from 5 to 4 -move 1 from 7 to 2 -move 2 from 2 to 6 -move 2 from 8 to 5 -move 5 from 4 to 9 -move 2 from 5 to 9 -move 7 from 9 to 8 -move 2 from 6 to 9 -move 4 from 8 to 9 -move 7 from 9 to 7 -move 13 from 9 to 5 -move 10 from 5 to 1 -move 3 from 8 to 4 -move 5 from 1 to 3 -move 3 from 5 to 6 -move 3 from 9 to 7 -move 1 from 1 to 7 -move 2 from 1 to 3 -move 1 from 6 to 1 -move 4 from 3 to 8 -move 1 from 8 to 9 -move 1 from 8 to 7 -move 1 from 8 to 4 -move 1 from 9 to 7 -move 1 from 8 to 5 -move 2 from 4 to 3 -move 4 from 6 to 3 -move 1 from 5 to 1 -move 1 from 6 to 4 -move 2 from 4 to 5 -move 1 from 4 to 6 -move 1 from 6 to 4 -move 30 from 7 to 3 -move 1 from 5 to 1 -move 6 from 7 to 3 -move 2 from 1 to 7 -move 2 from 1 to 2 -move 2 from 2 to 1 -move 1 from 4 to 9 -move 3 from 1 to 2 -move 1 from 9 to 5 -move 2 from 7 to 1 -move 1 from 7 to 3 -move 1 from 1 to 9 -move 1 from 5 to 8 -move 1 from 1 to 2 -move 1 from 7 to 3 -move 1 from 9 to 4 -move 18 from 3 to 4 -move 1 from 5 to 9 -move 1 from 9 to 6 -move 1 from 2 to 7 -move 1 from 8 to 7 -move 1 from 6 to 3 -move 1 from 7 to 2 -move 14 from 4 to 6 -move 1 from 7 to 6 -move 15 from 6 to 4 -move 20 from 3 to 1 -move 5 from 4 to 9 -move 5 from 4 to 2 -move 15 from 1 to 7 -move 11 from 7 to 9 -move 2 from 7 to 6 -move 1 from 6 to 4 -move 1 from 6 to 3 -move 2 from 7 to 8 -move 10 from 4 to 3 -move 15 from 9 to 3 -move 1 from 9 to 7 -move 29 from 3 to 6 -move 3 from 1 to 6 -move 1 from 8 to 4 -move 2 from 4 to 3 -move 1 from 8 to 9 -move 4 from 6 to 1 -move 20 from 6 to 2 -move 5 from 1 to 9 -move 3 from 6 to 2 -move 4 from 6 to 3 -move 4 from 3 to 1 -move 4 from 1 to 4 -move 3 from 4 to 8 -move 6 from 3 to 4 -move 6 from 2 to 6 -move 1 from 7 to 1 -move 3 from 6 to 8 -move 6 from 9 to 3 -move 1 from 1 to 4 -move 1 from 1 to 7 -move 3 from 4 to 5 -move 2 from 6 to 4 -move 2 from 5 to 6 -move 4 from 8 to 7 -move 1 from 5 to 6 -move 1 from 8 to 4 -move 1 from 8 to 4 -move 2 from 4 to 9 -move 4 from 7 to 8 -move 4 from 4 to 3 -move 1 from 7 to 9 -move 4 from 8 to 6 -move 1 from 3 to 4 -move 1 from 3 to 5 -move 2 from 4 to 7 -move 4 from 6 to 3 -move 2 from 9 to 1 -move 2 from 7 to 4 -move 1 from 5 to 1 -move 1 from 3 to 4 -move 1 from 9 to 3 -move 4 from 4 to 5 -move 2 from 5 to 3 -move 1 from 5 to 7 -move 1 from 5 to 8 -move 2 from 6 to 4 -move 3 from 1 to 3 -move 21 from 3 to 5 -move 3 from 6 to 1 -move 1 from 7 to 1 -move 4 from 2 to 6 -move 1 from 8 to 2 -move 10 from 2 to 4 -move 4 from 1 to 2 -move 1 from 6 to 5 -move 2 from 6 to 9 -move 7 from 4 to 9 -move 1 from 6 to 5 -move 3 from 9 to 4 -move 6 from 2 to 8 -move 3 from 9 to 1 -move 8 from 4 to 3 -move 1 from 9 to 4 -move 21 from 5 to 7 -move 1 from 1 to 3 -move 2 from 9 to 6 -move 14 from 7 to 1 -move 2 from 4 to 1 -move 2 from 8 to 7 -move 1 from 8 to 2 -move 11 from 2 to 9 -move 8 from 9 to 6 -move 4 from 7 to 1 -move 1 from 7 to 4 -move 2 from 3 to 5 -move 1 from 1 to 6 -move 1 from 8 to 2 -move 3 from 7 to 5 -move 6 from 1 to 7 -move 1 from 8 to 7 -move 1 from 4 to 5 -move 4 from 6 to 5 -move 6 from 7 to 6 -move 3 from 9 to 1 -move 1 from 7 to 3 -move 11 from 5 to 1 -move 1 from 5 to 2 -move 9 from 6 to 4 -move 1 from 7 to 3 -move 2 from 6 to 1 -move 1 from 2 to 1 -move 1 from 2 to 6 -move 14 from 1 to 5 -move 1 from 8 to 4 -move 10 from 1 to 5 -move 3 from 5 to 1 -move 8 from 3 to 8 -move 16 from 5 to 7 -move 2 from 1 to 9 -move 3 from 8 to 1 -move 1 from 2 to 4 -move 6 from 7 to 4 -move 3 from 5 to 8 -move 2 from 3 to 6 -move 7 from 1 to 7 -move 14 from 4 to 3 -move 9 from 7 to 8 -move 2 from 4 to 1 -move 9 from 8 to 4 -move 7 from 8 to 2 -move 6 from 1 to 8 -move 1 from 9 to 7 -move 1 from 1 to 6 -move 1 from 9 to 6 -move 1 from 5 to 9 -move 1 from 5 to 3 -move 9 from 4 to 9 -move 3 from 3 to 6 -move 8 from 6 to 3 -move 1 from 2 to 9 -move 8 from 9 to 8 -move 6 from 2 to 9 -move 2 from 6 to 1 -move 7 from 8 to 6 -move 2 from 9 to 6 -move 8 from 7 to 8 -move 1 from 4 to 5 -move 9 from 3 to 5 -move 2 from 1 to 4 -move 1 from 7 to 4 -move 2 from 4 to 3 -move 11 from 8 to 1 -move 1 from 4 to 7 -move 1 from 7 to 8 -move 5 from 1 to 3 -move 4 from 6 to 4 -move 2 from 4 to 8 -move 1 from 4 to 8 -move 7 from 8 to 9 -move 1 from 8 to 9 -move 1 from 8 to 5 -move 18 from 3 to 2 -move 17 from 2 to 7 -move 6 from 5 to 4 -move 1 from 2 to 5 -move 4 from 4 to 6 -move 4 from 6 to 9 -move 15 from 7 to 9 -move 2 from 1 to 6 -move 2 from 7 to 9 -move 28 from 9 to 2 -move 1 from 6 to 7 -move 4 from 6 to 9 -move 3 from 1 to 7 -move 2 from 6 to 3 -move 1 from 4 to 7 -move 8 from 9 to 5 -move 13 from 5 to 3 -move 1 from 5 to 7 -move 3 from 9 to 4 -move 8 from 3 to 7 -move 28 from 2 to 5 -move 1 from 9 to 8 -move 4 from 3 to 4 -move 4 from 7 to 5 -move 2 from 3 to 9 -move 21 from 5 to 4 -move 1 from 5 to 7 -move 1 from 3 to 5 -move 3 from 5 to 7 -move 1 from 1 to 3 -move 3 from 7 to 3 -move 5 from 7 to 6 -move 10 from 4 to 8 -move 6 from 5 to 4 -move 1 from 9 to 3 -move 15 from 4 to 5 -move 10 from 4 to 7 -move 3 from 3 to 7 -move 1 from 3 to 4 -move 1 from 3 to 4 -move 7 from 5 to 1 -move 2 from 4 to 7 -move 1 from 9 to 2 -move 2 from 6 to 9 -move 1 from 5 to 3 -move 1 from 3 to 8 -move 10 from 7 to 9 -move 2 from 8 to 1 -move 9 from 9 to 2 -move 1 from 4 to 3 -move 9 from 8 to 7 -move 1 from 2 to 8 -move 5 from 5 to 4 -move 1 from 3 to 2 -move 5 from 4 to 3 -move 3 from 5 to 9 -move 6 from 7 to 3 -move 1 from 6 to 5 -move 5 from 9 to 7 -move 2 from 5 to 6 -move 3 from 6 to 7 -move 4 from 1 to 4 -move 6 from 2 to 7 -move 17 from 7 to 5 -move 1 from 6 to 1 -move 5 from 3 to 6 -move 10 from 7 to 2 -move 1 from 8 to 4 -move 1 from 9 to 8 -move 3 from 4 to 1 -move 1 from 7 to 4 -move 5 from 5 to 9 -move 2 from 8 to 7 -move 3 from 3 to 7 -move 4 from 2 to 3 -move 3 from 4 to 6 -move 7 from 5 to 8 -move 7 from 2 to 8 -move 4 from 9 to 8 -move 12 from 8 to 3 -move 17 from 3 to 2 -move 1 from 7 to 9 -move 1 from 3 to 9 -move 3 from 9 to 1 -move 2 from 5 to 1 -move 1 from 3 to 5 -move 4 from 5 to 8 -move 6 from 8 to 1 -move 17 from 2 to 3 -move 13 from 3 to 2 -move 1 from 3 to 9 -move 1 from 8 to 4 -move 1 from 4 to 8 -move 1 from 9 to 1 -move 2 from 7 to 2 -move 8 from 6 to 2 -move 2 from 7 to 5 -move 9 from 1 to 3 -move 13 from 2 to 9 -move 6 from 1 to 4 -move 6 from 4 to 5 -move 3 from 8 to 1 -move 2 from 1 to 8 -move 8 from 5 to 7 -move 2 from 3 to 1 -move 9 from 3 to 1 -move 3 from 8 to 2 -move 1 from 1 to 9 -move 1 from 3 to 9 -move 6 from 7 to 3 -move 4 from 2 to 7 -move 14 from 1 to 6 -move 2 from 3 to 9 -move 3 from 3 to 7 -move 6 from 2 to 1 -move 2 from 1 to 2 -move 9 from 6 to 3 -move 11 from 9 to 5 -move 9 from 7 to 6 -move 6 from 6 to 2 -move 1 from 1 to 8 -move 5 from 9 to 4 -move 1 from 8 to 5 -move 9 from 2 to 7 -move 10 from 5 to 8 \ No newline at end of file diff --git a/src/lib.rs b/src/lib.rs index c73f603..6b038a0 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,5 +1,4 @@ pub mod prob1; pub mod prob2; pub mod prob3; -pub mod prob4; -pub mod prob5; \ No newline at end of file +pub mod prob4; \ No newline at end of file diff --git a/src/main.rs b/src/main.rs index daf8965..61b2c22 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,4 @@ -use advent_of_code::{prob1, prob2, prob3, prob4, prob5}; +use advent_of_code::{prob1, prob2, prob3, prob4}; fn main() { { @@ -28,14 +28,4 @@ fn main() { let max_part1 = prob4::solve(file_path, &prob4::mutual_inclusion); println!("Solution for problem 4 part 1: {max_part1}"); } - { - let file_path = "prob4_part1.txt"; - let max_part1 = prob4::solve(file_path, &prob4::complete_overlap); - println!("Solution for problem 4 part 2: {max_part1}"); - } - { - let file_path = "prob5_part1.txt"; - let max_part1 = prob5::solve(file_path); - println!("Solution for problem 5 part 1: {max_part1}"); - } } diff --git a/src/prob4/mod.rs b/src/prob4/mod.rs index 35e3b3e..6219ab8 100644 --- a/src/prob4/mod.rs +++ b/src/prob4/mod.rs @@ -3,12 +3,6 @@ pub fn mutual_inclusion(first_pair: &[u32], second_pair: &[u32]) -> bool { || (second_pair[0] <= first_pair[0] && second_pair[1] >= first_pair[1]) } -pub fn complete_overlap(first_pair: &[u32], second_pair: &[u32]) -> bool { - first_pair[0] >= second_pair[0] && first_pair[0] <= second_pair[1] - || first_pair[1] >= second_pair[0] && first_pair[1] <= second_pair[1] - || mutual_inclusion(first_pair, second_pair) -} - pub fn solve(file_path: &str, unary_operator: &dyn Fn(&[u32], &[u32]) -> bool) -> i32 { std::fs::read_to_string(file_path) .expect("Please provide a text file as an argument.") diff --git a/src/prob5.rs b/src/prob5.rs deleted file mode 100644 index 8bb5be5..0000000 --- a/src/prob5.rs +++ /dev/null @@ -1,120 +0,0 @@ -use nom::{ - branch::alt, - bytes::complete::{tag, take, take_while1}, - combinator::{all_consuming, map, map_res, opt}, - sequence::{delimited, preceded, tuple}, - Finish, IResult, -}; - -#[derive(Debug)] -struct Instruction { - quantity: usize, - src: usize, - dst: usize, -} - -/// Used to parse a crate -/// -/// # Arguments -/// -/// * `i`: -/// -/// returns: Result<(&str, char), Err>> -/// -fn parse_crate(i: &str) -> IResult<&str, char> { - let first_char = |s: &str| s.chars().next().unwrap(); - let f = delimited(tag("["), take(1_usize), tag("]")); - map(f, first_char)(i) -} - -fn parse_hole(i: &str) -> IResult<&str, ()> { - // `drop` takes a value and returns nothing, which is - // perfect for our case - map(tag(" "), drop)(i) -} - -fn parse_crate_or_hole(i: &str) -> IResult<&str, Option> { - alt((map(parse_crate, Some), map(parse_hole, |_| None)))(i) -} - -fn parse_crate_line(i: &str) -> IResult<&str, Vec>> { - let (mut i, c) = parse_crate_or_hole(i)?; - let mut v = vec![c]; - - loop { - let (next_i, maybe_c) = opt(preceded(tag(" "), parse_crate_or_hole))(i)?; - match maybe_c { - Some(c) => v.push(c), - None => break, - } - i = next_i; - } - - Ok((i, v)) -} - -fn transpose_rev(v: Vec>>) -> Vec> { - assert!(!v.is_empty()); - let len = v[0].len(); - let mut iters: Vec<_> = v.into_iter().map(|n| n.into_iter()).collect(); - (0..len) - .map(|_| { - iters - .iter_mut() - .filter_map(|n| n.next().unwrap()) - .collect::>() - }) - .collect() -} - -fn parse_number(i: &str) -> IResult<&str, usize> { - map_res(take_while1(|c: char| c.is_ascii_digit()), |s: &str| { - s.parse::() - })(i) -} - -fn parse_pile_number(i: &str) -> IResult<&str, usize> { - map(parse_number, |i| i - 1)(i) -} - -fn parse_instruction(i: &str) -> IResult<&str, Instruction> { - map( - tuple(( - preceded(tag("move "), parse_number), - preceded(tag(" from "), parse_pile_number), - preceded(tag(" to "), parse_pile_number), - )), - |(quantity, src, dst)| Instruction { quantity, src, dst }, - )(i) -} - -fn parser(content: &str) { - let mut lines = content.lines(); - let crate_lines = (&mut lines) - .map_while(|line| { - all_consuming(parse_crate_line)(line) - .finish() - .ok() - .map(|(_, line)| line) - }) - .collect(); - - let crate_columns = transpose_rev(crate_lines); - - crate_columns.iter().for_each(|item| println!("{item:?}")); - - assert!(lines.next().unwrap().is_empty()); - - let instructions: Vec<_> = lines - .map(|line| all_consuming(parse_instruction)(line).finish().unwrap().1) - .collect(); - for ins in &instructions { - println!("{ins:?}"); - } -} - -pub fn solve(file_path: &str) -> i32 { - let content = std::fs::read_to_string(file_path).expect("Please provide a file."); - parser(&content); - 0 -}