day1 and day2

This commit is contained in:
2024-12-01 21:41:28 -08:00
commit 14e52b234f
10 changed files with 2582 additions and 0 deletions

1
.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
/target

290
Cargo.lock generated Normal file
View File

@@ -0,0 +1,290 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "advent2024"
version = "0.1.0"
dependencies = [
"clap",
"error-stack",
"thiserror",
]
[[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 = "anyhow"
version = "1.0.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
[[package]]
name = "clap"
version = "4.5.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f"
dependencies = [
"clap_builder",
"clap_derive",
]
[[package]]
name = "clap_builder"
version = "4.5.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec"
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 = "error-stack"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe413319145d1063f080f27556fd30b1d70b01e2ba10c2a6e40d4be982ffc5d1"
dependencies = [
"anyhow",
"rustc_version",
]
[[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 = "proc-macro2"
version = "1.0.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
dependencies = [
"proc-macro2",
]
[[package]]
name = "rustc_version"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
dependencies = [
"semver",
]
[[package]]
name = "semver"
version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
[[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.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "thiserror"
version = "2.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "2.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
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 = "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"

9
Cargo.toml Normal file
View File

@@ -0,0 +1,9 @@
[package]
name = "advent2024"
version = "0.1.0"
edition = "2021"
[dependencies]
clap = { version = "4.5.21", features = ["derive"] }
error-stack = "0.5.0"
thiserror = "2.0.3"

83
src/day1.rs Normal file
View File

@@ -0,0 +1,83 @@
use error_stack::ResultExt;
use std::num::ParseIntError;
use std::str::FromStr;
use thiserror::Error;
#[derive(Debug, Error)]
pub enum Error {
#[error("Parsing error")]
ParseError,
}
pub fn run(buffer: String) -> error_stack::Result<(), Error> {
let (mut lefts, mut rights) = parse_input(buffer).change_context(Error::ParseError)?;
lefts.sort();
rights.sort();
let mut total_difference = 0;
for (left, right) in lefts.iter().zip(rights.iter()) {
let delta = std::cmp::max(left, right) - std::cmp::min(left, right);
total_difference += delta;
}
println!(
"The total difference of the sorted sets is {}",
total_difference
);
let mut similarity_score = 0;
for left in lefts.iter() {
let mut count = 0;
for right in rights.iter() {
if left == right {
count += 1;
}
}
similarity_score += left * count;
}
println!("The similarity score is {}", similarity_score);
Ok(())
}
#[derive(Debug, Error)]
enum ParseError {
#[error("Invalid left value: {0}")]
InvalidLeftValue(ParseIntError),
#[error("Invalid right value: {0}")]
InvalidRightValue(ParseIntError),
}
fn parse_input(buffer: String) -> error_stack::Result<(Vec<u64>, Vec<u64>), ParseError> {
let mut lefts = vec![];
let mut rights = vec![];
for (line_no, line) in buffer.lines().enumerate() {
let Some((left, rest)) = line.split_once(" ") else {
continue;
};
let right = rest.trim();
let left_val = u64::from_str(left)
.map_err(ParseError::InvalidLeftValue)
.attach_printable(format!("on line {line_no}"))
.attach_printable(format!("input value '{left}'"))?;
let right_val = u64::from_str(right)
.map_err(ParseError::InvalidRightValue)
.attach_printable(format!("on line {line_no}"))
.attach_printable(format!("input value '{right}'"))?;
lefts.push(left_val);
rights.push(right_val);
}
Ok((lefts, rights))
}

106
src/day2.rs Normal file
View File

@@ -0,0 +1,106 @@
use error_stack::ResultExt;
use std::num::ParseIntError;
use std::str::FromStr;
use thiserror::Error;
#[derive(Debug, Error)]
pub enum Error {
#[error("Parsing error")]
ParseError,
}
pub fn run(buffer: String) -> error_stack::Result<(), Error> {
let readings = parse_input(buffer).change_context(Error::ParseError)?;
let mut safe_reports = 0;
let mut dampened_reports = 0;
'outer: for reading in readings.iter() {
if is_good_report(reading.iter().copied()) {
safe_reports += 1;
} else {
for i in 0..reading.len() {
let new_iter = reading
.iter()
.take(i)
.chain(reading.iter().skip(i + 1))
.copied();
if is_good_report(new_iter) {
dampened_reports += 1;
continue 'outer;
}
}
}
}
println!("{} of {} reports are safe.", safe_reports, readings.len());
println!(
"{} of {} reports are safe or have one bad item.",
safe_reports + dampened_reports,
readings.len()
);
Ok(())
}
fn is_good_report<I: Iterator<Item = u64>>(mut reading: I) -> bool {
let Some(mut last) = reading.next() else {
return true;
};
let mut is_ascending = None;
for subsequent in reading {
if std::cmp::max(subsequent, last) - std::cmp::min(subsequent, last) > 3 {
return false;
}
match is_ascending {
None if subsequent > last => {
is_ascending = Some(true);
}
None if subsequent < last => {
is_ascending = Some(false);
}
None => return false,
Some(true) if subsequent <= last => return false,
Some(false) if subsequent >= last => return false,
Some(_) => {}
}
last = subsequent;
}
true
}
#[derive(Debug, Error)]
enum ParseError {
#[error("Invalid numeric value: {0}")]
InvalidNumericValue(ParseIntError),
}
fn parse_input(buffer: String) -> error_stack::Result<Vec<Vec<u64>>, ParseError> {
let mut result = vec![];
for (line_no, line) in buffer.lines().enumerate() {
let mut items = vec![];
for item in line.split(" ") {
let item_val = u64::from_str(item)
.map_err(ParseError::InvalidNumericValue)
.attach_printable(format!("on line {line_no}"))
.attach_printable(format!("input value: '{item}'"))?;
items.push(item_val);
}
result.push(items);
}
Ok(result)
}

81
src/main.rs Normal file
View File

@@ -0,0 +1,81 @@
mod day1;
mod day2;
use clap::{Parser, Subcommand};
use error_stack::{report, ResultExt};
use std::path::PathBuf;
use thiserror::Error;
#[derive(Debug, Parser)]
struct Argument {
#[command(subcommand)]
day: Day,
#[arg(short, long)]
input: Option<PathBuf>,
}
#[derive(Debug, Subcommand)]
enum Day {
/// Read in a data stream containing space-separated numbers, and compute
/// the total difference between them once sorted, along with a similarity
/// score
Day1,
/// Count how many readings from the RNR are safe
Day2,
}
#[derive(Debug, Error)]
enum TopLevelError {
#[error("Input file is not actually a file.")]
NotActualFile,
#[error("Failed to read input file")]
InputReadError,
#[error("Failed to read input from stdin (not input file given)")]
StdinReadError,
#[error("Failed to run day 1 code")]
Day1,
#[error("Failed to run day 2 code")]
Day2,
}
fn real_main(argument: Argument) -> error_stack::Result<(), TopLevelError> {
let (input_buffer, input_attachment) = match argument.input {
None => {
let buffer = std::io::read_to_string(std::io::stdin())
.map_err(|x| report!(TopLevelError::StdinReadError).attach_printable(x))?;
(buffer, "from standard input".to_string())
}
Some(path) => {
if !path.is_file() {
return Err(report!(TopLevelError::NotActualFile))
.attach_printable(format!("file path: {}", path.display()));
}
let buffer = std::fs::read_to_string(&path).map_err(|x| {
report!(TopLevelError::InputReadError)
.attach_printable(format!("file path: {}", path.display()))
.attach_printable(x)
})?;
(buffer, format!("from input file {}", path.display()))
}
};
match argument.day {
Day::Day1 => day1::run(input_buffer)
.change_context(TopLevelError::Day1)
.attach_printable(input_attachment),
Day::Day2 => day2::run(input_buffer)
.change_context(TopLevelError::Day2)
.attach_printable(input_attachment),
}
}
fn main() {
let argument = Argument::parse();
if let Err(e) = real_main(argument) {
eprintln!("ERROR: {}", e);
}
}

6
tests/01_example Normal file
View File

@@ -0,0 +1,6 @@
3 4
4 3
2 5
1 3
3 9
3 3

1000
tests/01_input1.txt Normal file

File diff suppressed because it is too large Load Diff

6
tests/02_example Normal file
View File

@@ -0,0 +1,6 @@
7 6 4 2 1
1 2 7 8 9
9 7 6 2 1
1 3 2 4 5
8 6 4 4 1
1 3 6 7 9

1000
tests/02_input.txt Normal file

File diff suppressed because it is too large Load Diff