kageru/advent-of-code
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

get rid of ranges

This commit is contained in:
kageru 2023-12-03 20:21:13 +01:00
parent db09b873ed
commit 932d92ddba
Signed by: kageru
GPG Key ID: 8282A2BEA4ADA3D2
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
2023/src/bin/day03.rs
View File

@ -1,6 +1,5 @@
#![feature(test, try_blocks)] #![feature(test, try_blocks)]
extern crate test; extern crate test;
use std::ops::RangeInclusive;
use aoc2023::{ use aoc2023::{
boilerplate, boilerplate,
@ -12,7 +11,8 @@ use itertools::Itertools;
const DAY: usize = 3; const DAY: usize = 3;
type I = i32; type I = i32;
type Grid<'a> = Vec<&'a [u8]>; type Grid<'a> = Vec<&'a [u8]>;
type Parsed<'a> = (Grid<'a>, Vec<Vec<(usize, RangeInclusive<usize>)>>); type Region = (usize, (usize, usize));
type Parsed<'a> = (Grid<'a>, Vec<Vec<Region>>);
fn parse_input(raw: &str) -> Parsed { fn parse_input(raw: &str) -> Parsed {
let grid = raw.lines().map(|l| l.as_bytes()).collect_vec(); let grid = raw.lines().map(|l| l.as_bytes()).collect_vec();
@ -22,24 +22,24 @@ fn parse_input(raw: &str) -> Parsed {
.map(|(x, l)| { .map(|(x, l)| {
l.iter() l.iter()
.enumerate() .enumerate()
.filter_map(move |(y, c)| c.is_ascii_digit().then_some((x, y..=y))) .filter_map(move |(y, c)| c.is_ascii_digit().then_some((x, (y, y))))
.coalesce( .coalesce(
|(x1, y1), (x2, y2)| { |(x1, (y11, y12)), (x2, (y21, y22))| {
if y1.end() + 1 == *y2.start() { if y12 + 1 == y21 {
Ok((x1, *y1.start()..=*y2.end())) Ok((x1, (y11, y22)))
} else { } else {
Err(((x1, y1), (x2, y2))) Err(((x1, (y11, y12)), (x2, (y21, y22))))
} }
}, },
) )
.collect_vec() .collect()
}) })
.collect_vec(); .collect();
(grid, number_positions) (grid, number_positions)
} }
fn parse_at(grid: &Grid, (x, ys): (usize, RangeInclusive<usize>)) -> usize { fn parse_at(grid: &Grid, (x, (y1, y2)): Region) -> usize {
String::from_utf8_lossy(&grid[x][ys]).parse::<usize>().unwrap() String::from_utf8_lossy(&grid[x][y1..=y2]).parse().unwrap()
} }
fn part1((grid, number_positions): &Parsed) -> usize { fn part1((grid, number_positions): &Parsed) -> usize {
@ -47,9 +47,9 @@ fn part1((grid, number_positions): &Parsed) -> usize {
.iter() .iter()
.flatten() .flatten()
.cloned() .cloned()
.filter_map(|(x, ys)| { .filter_map(|(x, (y1, y2))| {
let start = PositionND([x as I, *ys.start() as I]); let start = PositionND([x as I, y1 as I]);
let end = PositionND([x as I, *ys.end() as I]); let end = PositionND([x as I, y2 as I]);
start start
.neighbors() .neighbors()
.into_iter() .into_iter()
@ -57,13 +57,13 @@ fn part1((grid, number_positions): &Parsed) -> usize {
.any(|PositionND([x, y])| { .any(|PositionND([x, y])| {
!matches!(grid.get(x as usize).and_then(|ys| ys.get(y as usize)), Some(b'0'..=b'9' | b'.') | None) !matches!(grid.get(x as usize).and_then(|ys| ys.get(y as usize)), Some(b'0'..=b'9' | b'.') | None)
}) })
.then(|| parse_at(grid, (x, ys))) .then(|| parse_at(grid, (x, (y1, y2))))
}) })
.sum() .sum()
} }
fn part_of(PositionND([_, y]): Position2D<I>, (_, ys): &(usize, RangeInclusive<usize>)) -> bool { fn part_of(PositionND([_, y]): Position2D<I>, (_, (y1, y2)): &Region) -> bool {
ys.contains(&(y as usize)) (y1..=y2).contains(&&(y as usize))
} }
fn part2((grid, number_positions): &Parsed) -> usize { fn part2((grid, number_positions): &Parsed) -> usize {
@ -75,7 +75,7 @@ fn part2((grid, number_positions): &Parsed) -> usize {
number_positions[(p.0[0].dec() as usize)..=(p.0[0].inc() as usize)] number_positions[(p.0[0].dec() as usize)..=(p.0[0].inc() as usize)]
.iter() .iter()
.flatten() .flatten()
.filter_map(|np| neighbors.iter().find_map(|&n| part_of(n, np).then(|| parse_at(grid, np.clone())))) .filter_map(|&np| neighbors.iter().find_map(|&n| part_of(n, &np).then(|| parse_at(grid, np))))
.collect_tuple() .collect_tuple()
}) })
.map(|(a, b)| a * b) .map(|(a, b)| a * b)

10
2023/src/position.rs
View File

@ -184,27 +184,27 @@ mod tests {
#[test] #[test]
fn test_neighbor_vectors() { fn test_neighbor_vectors() {
let n = neighbor_vectors::<2>(); let n = neighbor_vectors::<i32, 2>();
assert_eq!(n, [[-1, -1], [-1, 0], [-1, 1], [0, -1], [0, 0], [0, 1], [1, -1], [1, 0], [1, 1],]); assert_eq!(n, [[-1, -1], [-1, 0], [-1, 1], [0, -1], [0, 0], [0, 1], [1, -1], [1, 0], [1, 1],]);
} }
#[bench] #[bench]
fn bench_neighbor_vectors_2d(b: &mut test::Bencher) { fn bench_neighbor_vectors_2d(b: &mut test::Bencher) {
b.iter(|| test::black_box(neighbor_vectors::<2>())) b.iter(|| test::black_box(neighbor_vectors::<i32, 2>()))
} }
#[bench] #[bench]
fn bench_neighbor_vectors_3d(b: &mut test::Bencher) { fn bench_neighbor_vectors_3d(b: &mut test::Bencher) {
b.iter(|| test::black_box(neighbor_vectors::<3>())) b.iter(|| test::black_box(neighbor_vectors::<i32, 3>()))
} }
#[bench] #[bench]
fn bench_neighbor_vectors_4d(b: &mut test::Bencher) { fn bench_neighbor_vectors_4d(b: &mut test::Bencher) {
b.iter(|| test::black_box(neighbor_vectors::<4>())) b.iter(|| test::black_box(neighbor_vectors::<i32, 4>()))
} }
#[bench] #[bench]
fn bench_neighbor_vectors_5d(b: &mut test::Bencher) { fn bench_neighbor_vectors_5d(b: &mut test::Bencher) {
b.iter(|| test::black_box(neighbor_vectors::<5>())) b.iter(|| test::black_box(neighbor_vectors::<i32, 5>()))
} }
} }