Dreaded_X/aoc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed formatting

Browse Source
This commit is contained in:
Dreaded_X 2023-12-25 00:41:27 +01:00
parent fbd9e84f5f
commit 6233ade178
Signed by: Dreaded_X
GPG Key ID: 5A0CBFE3C3377FAA
3 changed files with 80 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
2023/src/bin/day05.rs
View File

@ -1,9 +1,6 @@
#![feature(iter_map_windows)] #![feature(iter_map_windows)]
#![feature(test)] #![feature(test)]
use std::{ use std::{cmp::max, collections::VecDeque};
cmp::max,
collections::VecDeque,
};
use anyhow::Result; use anyhow::Result;
use aoc::Solver; use aoc::Solver;

10
2023/src/bin/day14.rs
View File

@ -1,6 +1,10 @@
#![feature(test)] #![feature(test)]
use std::{fmt::Display, collections::{hash_map::DefaultHasher, HashMap}, hash::{Hash, Hasher}}; use std::{
collections::{hash_map::DefaultHasher, HashMap},
fmt::Display,
hash::{Hash, Hasher},
};
use anyhow::Result; use anyhow::Result;
use aoc::Solver; use aoc::Solver;
@ -116,7 +120,7 @@ fn tilt_east(grid: &mut [Vec<Space>]) {
for line in grid.iter_mut() { for line in grid.iter_mut() {
if line[x] == Space::Round { if line[x] == Space::Round {
let mut new_x = x; let mut new_x = x;
for (xx, space) in line.iter().enumerate().skip(x+1) { for (xx, space) in line.iter().enumerate().skip(x + 1) {
if space == &Space::Empty { if space == &Space::Empty {
new_x = xx new_x = xx
} else { } else {
@ -140,7 +144,7 @@ fn tilt_south(grid: &mut Vec<Vec<Space>>) {
for x in 0..width { for x in 0..width {
if grid[y][x] == Space::Round { if grid[y][x] == Space::Round {
let mut new_y = y; let mut new_y = y;
for (yy, line) in grid.iter().enumerate().skip(y+1) { for (yy, line) in grid.iter().enumerate().skip(y + 1) {
if line[x] == Space::Empty { if line[x] == Space::Empty {
new_y = yy new_y = yy
} else { } else {

124
2023/src/bin/day24.rs
View File

@ -1,10 +1,10 @@
#![feature(test)] #![feature(test)]
extern crate nalgebra as na; extern crate nalgebra as na;
use std::{str::FromStr, convert::Infallible, collections::HashMap}; use std::{collections::HashMap, convert::Infallible, str::FromStr};
use anyhow::Result; use anyhow::Result;
use aoc::Solver; use aoc::Solver;
use na::{SMatrix, SVector}; use na::{Matrix6, Vector6};
// -- Runners -- // -- Runners --
fn main() -> Result<()> { fn main() -> Result<()> {
@ -56,18 +56,18 @@ struct Hailstone {
pz: f64, pz: f64,
vx: f64, vx: f64,
vy: f64, vy: f64,
vz: f64 vz: f64,
} }
impl Hailstone { impl Hailstone {
fn intersect_2d(&self, other: &Hailstone) -> Option<(f64, f64)> { fn intersect_2d(&self, other: &Hailstone) -> Option<(f64, f64)> {
let dx = self.px - other.px; let dx = self.px - other.px;
let dy = self.py - other.py; let dy = self.py - other.py;
let d = self.vy * other.vx - self.vx * other.vy; let d = self.vy * other.vx - self.vx * other.vy;
let t1 = (other.vy*dx - other.vx * dy) / d; let t1 = (other.vy * dx - other.vx * dy) / d;
let t2 = (self.vy * dx - self.vx*dy) / d; let t2 = (self.vy * dx - self.vx * dy) / d;
if t1.is_sign_negative() || t2.is_sign_negative() { if t1.is_sign_negative() || t2.is_sign_negative() {
// Intersection is in the past // Intersection is in the past
@ -90,7 +90,10 @@ impl FromStr for Hailstone {
type Err = Infallible; type Err = Infallible;
fn from_str(s: &str) -> Result<Self, Self::Err> { fn from_str(s: &str) -> Result<Self, Self::Err> {
let parts: Vec<f64> = s.split([',', '@']).map(|part| part.trim().parse().unwrap()).collect(); let parts: Vec<f64> = s
.split([',', '@'])
.map(|part| part.trim().parse().unwrap())
.collect();
Ok(Hailstone { Ok(Hailstone {
px: parts[0], px: parts[0],
@ -112,7 +115,11 @@ fn mode(numbers: &[usize]) -> usize {
println!("{occurrences:?}"); println!("{occurrences:?}");
occurrences.into_iter().max_by_key(|&(_, count)| count).map(|(value, _)| value).unwrap() occurrences
.into_iter()
.max_by_key(|&(_, count)| count)
.map(|(value, _)| value)
.unwrap()
} }
// -- Solution -- // -- Solution --
@ -134,11 +141,19 @@ impl aoc::Solver for Day {
200000000000000.0..=400000000000000.0 200000000000000.0..=400000000000000.0
}; };
hailstones.iter().enumerate().flat_map(|(index_a, a)| { hailstones
hailstones.iter().enumerate().filter(|(index_b, _)| index_b < &index_a).filter_map(|(_, b)| { .iter()
a.intersect_2d(b) .enumerate()
}).collect::<Vec<_>>() .flat_map(|(index_a, a)| {
}).filter(|&(x, y)| range.contains(&x) && range.contains(&y)).count() hailstones
.iter()
.enumerate()
.filter(|(index_b, _)| index_b < &index_a)
.filter_map(|(_, b)| a.intersect_2d(b))
.collect::<Vec<_>>()
})
.filter(|&(x, y)| range.contains(&x) && range.contains(&y))
.count()
} }
fn part2(input: &str) -> Self::Output2 { fn part2(input: &str) -> Self::Output2 {
@ -168,52 +183,57 @@ impl aoc::Solver for Day {
let j = 1; let j = 1;
// Due to numerical instability we run this with several different options for the third // Due to numerical instability we run this with several different options for the third
// hailstone // hailstone
let solutions: Vec<_> = (2..h.len()).map(|k| { let solutions: Vec<_> = (2..h.len())
// Constant in the matrix .map(|k| {
let c1 = h[i].vz - h[j].vz; // Constant in the matrix
let c2 = h[i].py - h[j].py; let c1 = h[i].vz - h[j].vz;
let c3 = h[j].vy - h[i].vy; let c2 = h[i].py - h[j].py;
let c4 = h[j].pz - h[i].pz; let c3 = h[j].vy - h[i].vy;
let c5 = h[i].vx - h[j].vx; let c4 = h[j].pz - h[i].pz;
let c6 = h[j].px - h[i].px; let c5 = h[i].vx - h[j].vx;
let c6 = h[j].px - h[i].px;
let c7 = h[i].vz - h[k].vz; let c7 = h[i].vz - h[k].vz;
let c8 = h[i].py - h[k].py; let c8 = h[i].py - h[k].py;
let c9 = h[k].vy - h[i].vy; let c9 = h[k].vy - h[i].vy;
let c10 = h[k].pz - h[i].pz; let c10 = h[k].pz - h[i].pz;
let c11 = h[i].vx - h[k].vx; let c11 = h[i].vx - h[k].vx;
let c12 = h[k].px - h[i].px; let c12 = h[k].px - h[i].px;
// Setup the matrix // Setup the matrix
let matrix = SMatrix::<f64, 6, 6>::new( let matrix = Matrix6::new(
0.0, c1, c3, 0.0, c4, c2, 0.0, c1, c3, 0.0, c4, c2, -c1, 0.0, c5, -c4, 0.0, c6, -c3, -c5, 0.0, -c2, -c6,
-c1, 0.0, c5, -c4, 0.0, c6, 0.0, 0.0, c7, c9, 0.0, c10, c8, -c7, 0.0, c11, -c10, 0.0, c12, -c9, -c11, 0.0,
-c3, -c5, 0.0, -c2, -c6, 0.0, -c8, -c12, 0.0,
0.0, c7, c9, 0.0, c10, c8, );
-c7, 0.0, c11, -c10, 0.0, c12,
-c9, -c11, 0.0, -c8, -c12, 0.0
);
// Get the inverse of the matrix // Get the inverse of the matrix
let inverse = matrix.try_inverse().unwrap(); let inverse = matrix.try_inverse().unwrap();
// Constant on the rhs // Constant on the rhs
let k1 = h[i].py*h[i].vz - h[j].py*h[j].vz + h[j].pz*h[j].vy - h[i].pz*h[i].vy; let k1 =
let k2 = h[i].pz*h[i].vx - h[j].pz*h[j].vx + h[j].px*h[j].vz - h[i].px*h[i].vz; h[i].py * h[i].vz - h[j].py * h[j].vz + h[j].pz * h[j].vy - h[i].pz * h[i].vy;
let k3 = h[i].px*h[i].vy - h[j].px*h[j].vy + h[j].py*h[j].vx - h[i].py*h[i].vx; let k2 =
let k4 = h[i].py*h[i].vz - h[k].py*h[k].vz + h[k].pz*h[k].vy - h[i].pz*h[i].vy; h[i].pz * h[i].vx - h[j].pz * h[j].vx + h[j].px * h[j].vz - h[i].px * h[i].vz;
let k5 = h[i].pz*h[i].vx - h[k].pz*h[k].vx + h[k].px*h[k].vz - h[i].px*h[i].vz; let k3 =
let k6 = h[i].px*h[i].vy - h[k].px*h[k].vy + h[k].py*h[k].vx - h[i].py*h[i].vx; h[i].px * h[i].vy - h[j].px * h[j].vy + h[j].py * h[j].vx - h[i].py * h[i].vx;
let k4 =
h[i].py * h[i].vz - h[k].py * h[k].vz + h[k].pz * h[k].vy - h[i].pz * h[i].vy;
let k5 =
h[i].pz * h[i].vx - h[k].pz * h[k].vx + h[k].px * h[k].vz - h[i].px * h[i].vz;
let k6 =
h[i].px * h[i].vy - h[k].px * h[k].vy + h[k].py * h[k].vx - h[i].py * h[i].vx;
// Put them into a vector // Put them into a vector
let k = SVector::<f64, 6>::new(k1, k2, k3, k4, k5, k6); let k = Vector6::new(k1, k2, k3, k4, k5, k6);
// Calclate the solution // Calclate the solution
let solution = inverse * k; let solution = inverse * k;
// The sum of all elements of the starting position is the answer // The sum of all elements of the starting position is the answer
(solution[0] + solution[1] + solution[2]).round() as usize (solution[0] + solution[1] + solution[2]).round() as usize
}).collect(); })
.collect();
// The most common solution is the actual solution // The most common solution is the actual solution
mode(&solutions) mode(&solutions)