Gobidev/adventofcode2024
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Speed up day5

Browse Source
This commit is contained in:
Adrian Groh 2024-12-05 15:16:58 +01:00
parent 850c0f8a42
commit 738a079cfc
Signed by: Gobidev
GPG Key ID: 3AA3153E98B0D771
3 changed files with 72 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
day5/Cargo.lock generated
View File

@ -2,6 +2,60 @@
# It is not intended for manual editing. # It is not intended for manual editing.
version = 4 version = 4
[[package]]
name = "crossbeam-deque"
version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
dependencies = [
"crossbeam-epoch",
"crossbeam-utils",
]
[[package]]
name = "crossbeam-epoch"
version = "0.9.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
dependencies = [
"crossbeam-utils",
]
[[package]]
name = "crossbeam-utils"
version = "0.8.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
[[package]] [[package]]
name = "day5" name = "day5"
version = "0.1.0" version = "0.1.0"
dependencies = [
"rayon",
]
[[package]]
name = "either"
version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
[[package]]
name = "rayon"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
dependencies = [
"either",
"rayon-core",
]
[[package]]
name = "rayon-core"
version = "1.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
dependencies = [
"crossbeam-deque",
"crossbeam-utils",
]

1
day5/Cargo.toml
View File

@ -4,3 +4,4 @@ version = "0.1.0"
edition = "2021" edition = "2021"
[dependencies] [dependencies]
rayon = "1.10.0"

34
day5/src/main.rs
View File

@ -1,3 +1,5 @@
use rayon::prelude::*;
struct ParsedInput { struct ParsedInput {
rules: Vec<(u32, u32)>, rules: Vec<(u32, u32)>,
pages: Vec<Vec<u32>>, pages: Vec<Vec<u32>>,
@ -33,35 +35,33 @@ fn all_rules_apply(rules: &[(u32, u32)], page: &[u32]) -> bool {
fn part1(parsed_input: &ParsedInput) -> u32 { fn part1(parsed_input: &ParsedInput) -> u32 {
parsed_input parsed_input
.pages .pages
.iter() .par_iter()
.filter(|page| all_rules_apply(&parsed_input.rules, page)) .filter(|page| all_rules_apply(&parsed_input.rules, page))
.map(|rule| rule[rule.len() / 2]) .map(|rule| rule[rule.len() / 2])
.sum() .sum()
} }
fn part2(parsed_input: &ParsedInput) -> u32 { fn correct_page(page: &mut [u32], rules: &[(u32, u32)]) {
page.sort_by(|a, b| match all_rules_apply(rules, &[*a, *b]) {
true => std::cmp::Ordering::Less,
false => std::cmp::Ordering::Greater,
});
}
fn part2(parsed_input: &mut ParsedInput) -> u32 {
parsed_input parsed_input
.pages .pages
.iter() .par_iter_mut()
.filter(|page| !all_rules_apply(&parsed_input.rules, page)) .filter(|page| !all_rules_apply(&parsed_input.rules, page))
.fold(vec![], |mut acc, curr| { .map(|page| {
let mut corrected_page = curr.clone(); correct_page(page, &parsed_input.rules);
corrected_page.sort_unstable_by(|a, b| { page[page.len() / 2]
match all_rules_apply(&parsed_input.rules, &[*a, *b]) {
true => std::cmp::Ordering::Less,
false => std::cmp::Ordering::Greater,
}
});
acc.push(corrected_page);
acc
}) })
.iter()
.map(|rule| rule[rule.len() / 2])
.sum() .sum()
} }
fn main() { fn main() {
let input = parse(include_str!("../input.txt")); let mut input = parse(include_str!("../input.txt"));
println!("{}", part1(&input)); println!("{}", part1(&input));
println!("{}", part2(&input)); println!("{}", part2(&mut input));
} }