rdx7/aoc2024
1
0
Fork 0
mirror of https://github.com/Rhelvetican/aoc2024.git synced 2024-12-23 06:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: rdx7:1e68c2ac05a1249a10e3d3db7396cda2f968bd05
Branches Tags
rdx7:main
..
compare: rdx7:00793ab967380d60e2760bc0ba6782cf4ce4a4a6
Branches Tags
rdx7:main

No commits in common. "1e68c2ac05a1249a10e3d3db7396cda2f968bd05" and "00793ab967380d60e2760bc0ba6782cf4ce4a4a6" have entirely different histories.
1e68c2ac05 ... 00793ab967

33 changed files with 52 additions and 419 deletions
Show stats Expand all files Collapse all files

232
Cargo.lock generated
View file

@ -11,145 +11,20 @@ dependencies = [
"memchr",
]
[[package]]
name = "ansi_term"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
dependencies = [
"winapi",
]
[[package]]
name = "anstream"
version = "0.6.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
dependencies = [
"anstyle",
"anstyle-parse",
"anstyle-query",
"anstyle-wincon",
"colorchoice",
"is_terminal_polyfill",
"utf8parse",
]
[[package]]
name = "anstyle"
version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
[[package]]
name = "anstyle-parse"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
dependencies = [
"utf8parse",
]
[[package]]
name = "anstyle-query"
version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
dependencies = [
"windows-sys",
]
[[package]]
name = "anstyle-wincon"
version = "3.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
dependencies = [
"anstyle",
"windows-sys",
]
[[package]]
name = "aoc2024"
version = "0.1.0"
dependencies = [
"ansi_term",
"clap",
"paste",
"regex",
"thiserror",
]
[[package]]
name = "clap"
version = "4.5.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69371e34337c4c984bbe322360c2547210bf632eb2814bbe78a6e87a2935bd2b"
dependencies = [
"clap_builder",
"clap_derive",
]
[[package]]
name = "clap_builder"
version = "4.5.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e24c1b4099818523236a8ca881d2b45db98dadfb4625cf6608c12069fcbbde1"
dependencies = [
"anstream",
"anstyle",
"clap_lex",
"strsim",
]
[[package]]
name = "clap_derive"
version = "4.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
dependencies = [
"heck",
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "clap_lex"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7"
[[package]]
name = "colorchoice"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
[[package]]
name = "heck"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
[[package]]
name = "is_terminal_polyfill"
version = "1.70.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
[[package]]
name = "memchr"
version = "2.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
[[package]]
name = "paste"
version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
[[package]]
name = "proc-macro2"
version = "1.0.92"
@ -197,12 +72,6 @@ version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
[[package]]
name = "strsim"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]]
name = "syn"
version = "2.0.90"
@ -239,104 +108,3 @@ name = "unicode-ident"
version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
[[package]]
name = "utf8parse"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "winapi"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
dependencies = [
"winapi-i686-pc-windows-gnu",
"winapi-x86_64-pc-windows-gnu",
]
[[package]]
name = "winapi-i686-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows-sys"
version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
dependencies = [
"windows-targets",
]
[[package]]
name = "windows-targets"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
dependencies = [
"windows_aarch64_gnullvm",
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_gnullvm",
"windows_i686_msvc",
"windows_x86_64_gnu",
"windows_x86_64_gnullvm",
"windows_x86_64_msvc",
]
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
[[package]]
name = "windows_aarch64_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
[[package]]
name = "windows_i686_gnu"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
[[package]]
name = "windows_i686_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
[[package]]
name = "windows_i686_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
[[package]]
name = "windows_x86_64_gnu"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
[[package]]
name = "windows_x86_64_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"

3
Cargo.toml
View file

@ -4,8 +4,5 @@
version = "0.1.0"
[dependencies]
ansi_term = "0.12"
clap = { version = "4", features = ["derive"] }
paste = "1"
regex = "1"
thiserror = "2"

14
src/cli.rs
View file

@ -1,14 +0,0 @@
use std::path::PathBuf;
use clap::Parser;
#[derive(Parser, Debug, Clone)]
#[command(version, about, long_about = None)]
#[command(propagate_version = true)]
#[command(rename_all = "kebab-case")]
pub struct AocCli {
#[arg(short, long)]
pub day: u8,
#[arg(short, long, default_value = None)]
pub input: Option<PathBuf>,
}

1
src/lib.rs
View file

@ -1,3 +1,2 @@
pub mod cli;
pub mod solutions;
pub mod utils;

37
src/main.rs
View file

@ -1,36 +1,7 @@
use ansi_term::enable_ansi_support;
use aoc2024::{
cli::AocCli,
map_solution,
solutions::{
AocDayFiveSolution, AocDayFourSolution, AocDayOneSolution, AocDayThreeSolution,
AocDayTwoSolution, AocSolution,
},
utils::{Error, Result},
};
use clap::Parser;
use aoc2024::solutions::{day_5::AocDayFiveSolution, AocSolution};
fn main() -> Result<()> {
if let Err(e) = enable_ansi_support() {
println!("{e}");
}
fn main() {
let sol = AocDayFiveSolution;
let cli = match AocCli::try_parse() {
Ok(cli) => cli,
Err(e) => {
println!("{}", e.render().ansi());
return Ok(());
}
};
println!("Solution for Day {}:", cli.day);
map_solution! {cli :
1 => AocDayOneSolution,
2 => AocDayTwoSolution,
3 => AocDayThreeSolution,
4 => AocDayFourSolution,
5 => AocDayFiveSolution,
};
Ok(())
println!("p1: {}\np2: {}", sol.part_one(), sol.part_two())
}

27
src/solutions/day_1.rs
View file

@ -1,23 +1,16 @@
use std::{collections::HashMap, fs::read_to_string, path::Path};
use std::collections::HashMap;
use super::AocSolution;
use crate::utils::Result;
#[derive(Clone, Copy)]
pub struct AocDayOneSolution;
impl AocSolution for AocDayOneSolution {
type Output = u64;
const INPUT: &str = include_str!("../../input/day1.txt");
fn get_input(&self, path: Option<&Path>) -> Result<String> {
Ok(match path {
Some(p) => read_to_string(p)?,
None => read_to_string("./input/day_1.txt")?,
})
}
fn part_one(&self, input: &str) -> Result<Self::Output> {
let (mut left, mut right) = input
fn part_one(&self) -> Self::Output {
let (mut left, mut right) = Self::INPUT
.lines()
.filter_map(|s| s.split_once(' ').map(|(s, x)| (s.trim(), x.trim())))
.filter_map(
@ -35,18 +28,16 @@ impl AocSolution for AocDayOneSolution {
left.sort();
right.sort();
Ok(left
.into_iter()
left.into_iter()
.zip(right)
.map(|(l, r)| if l > r { l - r } else { r - l })
.sum())
.sum()
}
fn part_two(&self, input: &str) -> Result<Self::Output> {
fn part_two(&self) -> Self::Output {
let mut cache = HashMap::<u64, u64>::new();
let mut similarity_score = 0;
let (left, right) = input
let (left, right) = Self::INPUT
.lines()
.filter_map(|s| s.split_once(' ').map(|(s, x)| (s.trim(), x.trim())))
.filter_map(
@ -71,6 +62,6 @@ impl AocSolution for AocDayOneSolution {
}
}
Ok(similarity_score)
similarity_score
}
}

1
src/solutions/day_10.rs
View file

@ -1 +0,0 @@
pub struct AocDayTenSolution;

1
src/solutions/day_11.rs
View file

@ -1 +0,0 @@
pub struct AocDayElevenSolution;

1
src/solutions/day_12.rs
View file

@ -1 +0,0 @@
pub struct AocDayTwelveSolution;

1
src/solutions/day_13.rs
View file

@ -1 +0,0 @@
pub struct AocDayThirteenSolution;

1
src/solutions/day_14.rs
View file

@ -1 +0,0 @@
pub struct AocDayFourteenSolution;

1
src/solutions/day_15.rs
View file

@ -1 +0,0 @@
pub struct AocDayFifteenSolution;

1
src/solutions/day_16.rs
View file

@ -1 +0,0 @@
pub struct AocDaySixteenSolution;

1
src/solutions/day_17.rs
View file

@ -1 +0,0 @@
pub struct AocDaySeventeenSolution;

1
src/solutions/day_18.rs
View file

@ -1 +0,0 @@
pub struct AocDayEighteenSolution;

1
src/solutions/day_19.rs
View file

@ -1 +0,0 @@
pub struct AocDayNineteenSolution;

23
src/solutions/day_2.rs
View file

@ -1,7 +1,4 @@
use std::{fs::read_to_string, path::Path};
use super::AocSolution;
use crate::utils::Result;
fn is_safe(levels: &[i32]) -> bool {
let dec = levels[0] > levels[1];
@ -35,16 +32,10 @@ pub struct AocDayTwoSolution;
impl AocSolution for AocDayTwoSolution {
type Output = u64;
const INPUT: &str = include_str!("../../input/day2.txt");
fn get_input(&self, path: Option<&Path>) -> Result<String> {
Ok(match path {
Some(p) => read_to_string(p)?,
None => read_to_string("./input/day_2.txt")?,
})
}
fn part_one(&self, input: &str) -> Result<Self::Output> {
Ok(input
fn part_one(&self) -> Self::Output {
Self::INPUT
.lines()
.map(|n| {
n.split_whitespace()
@ -52,11 +43,11 @@ impl AocSolution for AocDayTwoSolution {
.collect::<Vec<_>>()
})
.filter(|s| is_safe(s))
.count() as u64)
.count() as u64
}
fn part_two(&self, input: &str) -> Result<Self::Output> {
Ok(input
fn part_two(&self) -> Self::Output {
Self::INPUT
.lines()
.map(|n| {
n.split_whitespace()
@ -64,6 +55,6 @@ impl AocSolution for AocDayTwoSolution {
.collect::<Vec<_>>()
})
.filter(|s| is_safe(s) || is_safe_with_rem(s))
.count() as u64)
.count() as u64
}
}

1
src/solutions/day_20.rs
View file

@ -1 +0,0 @@
pub struct AocDayTwentySolution;

1
src/solutions/day_21.rs
View file

@ -1 +0,0 @@
pub struct AocDayTwentyOneSolution;

1
src/solutions/day_22.rs
View file

@ -1 +0,0 @@
pub struct AocDayTwentyTwoSolution;

1
src/solutions/day_23.rs
View file

@ -1 +0,0 @@
pub struct AocDayTwentyThreeSolution;

1
src/solutions/day_24.rs
View file

@ -1 +0,0 @@
pub struct AocDayTwentyFourSolution;

1
src/solutions/day_25.rs
View file

@ -1 +0,0 @@
pub struct AocDayTwentyFiveSolution;

26
src/solutions/day_3.rs
View file

@ -1,9 +1,8 @@
use std::{fs::read_to_string, path::Path, sync::LazyLock};
use std::sync::LazyLock;
use regex::Regex;
use super::AocSolution;
use crate::utils::Result;
static MUL: LazyLock<Regex> =
LazyLock::new(|| Regex::new(r"mul\([0-9]{1,3},[0-9]{1,3}\)").unwrap());
@ -25,21 +24,18 @@ pub struct AocDayThreeSolution;
impl AocSolution for AocDayThreeSolution {
type Output = u64;
const INPUT: &str = include_str!("../../input/day3.txt");
fn get_input(&self, path: Option<&Path>) -> Result<String> {
Ok(match path {
Some(p) => read_to_string(p)?,
None => read_to_string("./input/day_3.txt")?,
})
fn part_one(&self) -> Self::Output {
MUL.find_iter(Self::INPUT)
.map(|x| x.as_str())
.map(as_mul)
.sum()
}
fn part_one(&self, input: &str) -> Result<Self::Output> {
Ok(MUL.find_iter(input).map(|x| x.as_str()).map(as_mul).sum())
}
fn part_two(&self, input: &str) -> Result<Self::Output> {
Ok(COND_MUL
.find_iter(input)
fn part_two(&self) -> Self::Output {
COND_MUL
.find_iter(Self::INPUT)
.map(|x| x.as_str())
.fold((0, true), |(sum, flag), cut| {
if cut.starts_with("mul") && flag {
@ -50,6 +46,6 @@ impl AocSolution for AocDayThreeSolution {
(sum, false)
}
})
.0)
.0
}
}

25
src/solutions/day_4.rs
View file

@ -1,7 +1,6 @@
use std::{collections::HashMap, fs::read_to_string, path::Path};
use std::collections::HashMap;
use super::AocSolution;
use crate::utils::Result;
const DIRS: [(i16, i16); 8] = [
(1, 0),
@ -74,17 +73,11 @@ impl XmasGrid {
pub struct AocDayFourSolution;
impl AocSolution for AocDayFourSolution {
type Output = u64;
type Output = usize;
const INPUT: &str = include_str!("../../input/day4.txt");
fn get_input(&self, path: Option<&Path>) -> Result<String> {
Ok(match path {
Some(p) => read_to_string(p)?,
None => read_to_string("./input/day_4.txt")?,
})
}
fn part_one(&self, input: &str) -> Result<Self::Output> {
let xmas = XmasGrid::new(input);
fn part_one(&self) -> Self::Output {
let xmas = XmasGrid::new(Self::INPUT);
let mut tmp = 0;
xmas.grid
@ -94,11 +87,11 @@ impl AocSolution for AocDayFourSolution {
tmp += xmas.find_xmas(pt);
});
Ok(tmp as Self::Output)
tmp as Self::Output
}
fn part_two(&self, input: &str) -> Result<Self::Output> {
let xmas = XmasGrid::new(input);
fn part_two(&self) -> Self::Output {
let xmas = XmasGrid::new(Self::INPUT);
let mut tmp = 0;
xmas.grid
@ -108,6 +101,6 @@ impl AocSolution for AocDayFourSolution {
tmp += xmas.find_x_mas(pt);
});
Ok(tmp as Self::Output)
tmp as Self::Output
}
}

23
src/solutions/day_5.rs
View file

@ -1,7 +1,6 @@
use std::{cmp::Ordering, collections::HashMap, fs::read_to_string, path::Path};
use std::{cmp::Ordering, collections::HashMap};
use super::AocSolution;
use crate::utils::{Error, Result};
#[derive(Debug)]
struct RuleChecker {
@ -77,23 +76,17 @@ pub struct AocDayFiveSolution;
impl AocSolution for AocDayFiveSolution {
type Output = u64;
const INPUT: &str = include_str!("../../input/day5.txt");
fn get_input(&self, path: Option<&Path>) -> Result<String> {
Ok(match path {
Some(p) => read_to_string(p)?,
None => read_to_string("./input/day_5.txt")?,
})
}
fn part_one(&self, input: &str) -> Result<Self::Output> {
let (rules, prints) = input.split_once("\r\n\r\n").ok_or(Error::InvalidInput)?;
fn part_one(&self) -> Self::Output {
let (rules, prints) = Self::INPUT.split_once("\r\n\r\n").unwrap_or(("", ""));
let checker = RuleChecker::new(rules, prints);
Ok(checker.compute_validated_print())
checker.compute_validated_print()
}
fn part_two(&self, input: &str) -> Result<Self::Output> {
let (rules, prints) = input.split_once("\r\n\r\n").ok_or(Error::InvalidInput)?;
fn part_two(&self) -> Self::Output {
let (rules, prints) = Self::INPUT.split_once("\r\n\r\n").unwrap_or(("", ""));
let mut checker = RuleChecker::new(rules, prints);
Ok(checker.compute_invalid_print())
checker.compute_invalid_print()
}
}

1
src/solutions/day_6.rs
View file

@ -1 +0,0 @@
pub struct AocDaySixSolution;

1
src/solutions/day_7.rs
View file

@ -1 +0,0 @@
pub struct AocDaySevenSolution;

1
src/solutions/day_8.rs
View file

@ -1 +0,0 @@
pub struct AocDayEightSolution;

1
src/solutions/day_9.rs
View file

@ -1 +0,0 @@
pub struct AocDayNineSolution;

12
src/solutions/mod.rs
View file

@ -1,10 +1,6 @@
use std::path::Path;
use crate::utils::Result;
macro_rules! define_solution {
($($id:ident),+ $(,)?) => {
$(mod $id; pub use $id::*;)+
$(pub mod $id;)+
};
}
@ -15,8 +11,8 @@ define_solution!(
pub trait AocSolution {
type Output;
const INPUT: &str;
fn get_input(&self, path: Option<&Path>) -> Result<String>;
fn part_one(&self, input: &str) -> Result<Self::Output>;
fn part_two(&self, input: &str) -> Result<Self::Output>;
fn part_one(&self) -> Self::Output;
fn part_two(&self) -> Self::Output;
}

13
src/utils/macros.rs
View file

@ -1,13 +0,0 @@
#[macro_export]
macro_rules! map_solution {
($cli:ident : $($day:expr => $sol:expr,)+ $(,)?) => {
match $cli .day {
$($day => {
let sol = $sol;
let input = sol.get_input($cli.input.as_deref())?;
println!("\tp1: {}\n\tp2: {}", sol.part_one(&input)?, sol.part_two(&input)?);
},)+
_ => return Err(Error::UnsupportedDay),
}
};
}

15
src/utils/mod.rs
View file

@ -1,16 +1 @@
#[macro_use]
pub mod macros;
pub type Result<T> = std::result::Result<T, Error>;
#[derive(thiserror::Error, Debug)]
pub enum Error {
#[error("IO error: {0}")]
Io(#[from] std::io::Error),
#[error("Invalid command usage: {0}")]
ClapError(#[from] clap::Error),
#[error("Invalid input.")]
InvalidInput,
#[error("Unsupported day.")]
UnsupportedDay,
}