alarsyo/advent-of-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

2021: day04: use Vec::retain

Browse source
This commit is contained in:
Antoine Martin 2021-12-04 15:38:33 +01:00
parent 9209659a5a
commit 66fa27de0b
1 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
aoc2021/src/day04.rs
View file

@ -36,7 +36,8 @@ fn part1(input: &str) -> Result<u64> {
'draw_loop: for draw in draws { 'draw_loop: for draw in draws {
for grid in &mut grids { for grid in &mut grids {
if grid.mark(draw) { grid.mark(draw);
if grid.is_winning() {
wgrid = Some(grid.clone()); wgrid = Some(grid.clone());
wdraw = Some(draw); wdraw = Some(draw);
break 'draw_loop; break 'draw_loop;
@ -74,21 +75,15 @@ fn part2(input: &str) -> Result<u64> {
.context("no draws available, didn't find last grid")?; .context("no draws available, didn't find last grid")?;
// TODO: replace with drain_filter when stabilized // TODO: replace with drain_filter when stabilized
let mut i = 0; grids.iter_mut().for_each(|grid| grid.mark(draw));
while i < grids.len() { grids.retain(|grid| !grid.is_winning());
let grid = &mut grids[i];
if grid.mark(draw) {
grids.remove(i);
} else {
i += 1;
}
}
} }
let last_grid = &mut grids[0]; let last_grid = &mut grids[0];
for draw in draws { for draw in draws {
if last_grid.mark(draw) { last_grid.mark(draw);
if last_grid.is_winning() {
return Ok(draw as u64 * last_grid.unmarked_numbers().map(|n| n as u64).sum::<u64>()); return Ok(draw as u64 * last_grid.unmarked_numbers().map(|n| n as u64).sum::<u64>());
} }
} }
@ -102,23 +97,26 @@ struct Grid {
grid: [bool; GRID_SIZE], grid: [bool; GRID_SIZE],
rows: [u8; GRID_HEIGHT], rows: [u8; GRID_HEIGHT],
cols: [u8; GRID_WIDTH], cols: [u8; GRID_WIDTH],
winning: bool,
} }
impl Grid { impl Grid {
fn mark(&mut self, draw: u8) -> bool { fn mark(&mut self, draw: u8) {
match self.number_to_pos.get(&draw) { if let Some(&(x, y)) = self.number_to_pos.get(&draw) {
Some(&(x, y)) => { *self.access_grid_mut(x, y) = true;
*self.access_grid_mut(x, y) = true;
self.rows[y] += 1; self.rows[y] += 1;
self.cols[x] += 1; self.cols[x] += 1;
self.rows[y] as usize == GRID_WIDTH || self.cols[x] as usize == GRID_HEIGHT self.winning =
} self.rows[y] as usize == GRID_WIDTH || self.cols[x] as usize == GRID_HEIGHT;
None => false,
} }
} }
fn is_winning(&self) -> bool {
self.winning
}
fn unmarked_numbers(&self) -> impl Iterator<Item = u8> + '_ { fn unmarked_numbers(&self) -> impl Iterator<Item = u8> + '_ {
self.number_to_pos self.number_to_pos
.iter() .iter()
@ -157,6 +155,7 @@ impl std::str::FromStr for Grid {
grid: [false; GRID_SIZE], grid: [false; GRID_SIZE],
rows: [0; GRID_HEIGHT], rows: [0; GRID_HEIGHT],
cols: [0; GRID_WIDTH], cols: [0; GRID_WIDTH],
winning: false,
}) })
} }
} }