jasterv/aoc_2021
1
0
Fork 0
mirror of https://codeberg.org/JasterV/aoc_2021.git synced 2026-04-26 18:40:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor

Browse source
This commit is contained in:
JasterV 2021-12-09 20:56:13 +01:00
parent dbf7d357ed
commit 100056b5e7
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
day4/src/main.rs
View file

@ -7,7 +7,7 @@ static INPUT_PATH: &str = "input.txt";
fn main() -> Result<()> { fn main() -> Result<()> {
let (nums, boards) = read_game(INPUT_PATH)?; let (nums, boards) = read_game(INPUT_PATH)?;
let winners = play_game(&nums, &boards); let (winners, _remaining) = play_game(&nums, &boards);
// First puzzle // First puzzle
let (winning_num, winning_board) = winners.first().unwrap(); let (winning_num, winning_board) = winners.first().unwrap();
println!("First puzzle: {}", winning_num * winning_board.get_score()); println!("First puzzle: {}", winning_num * winning_board.get_score());
@ -28,10 +28,9 @@ fn read_game(filename: &str) -> Result<(Vec<u16>, Vec<Board>)> {
Ok((nums_to_draw, boards)) Ok((nums_to_draw, boards))
} }
fn play_game(nums: &[u16], boards: &[Board]) -> Vec<(u16, Board)> { fn play_game(nums: &[u16], boards: &[Board]) -> (Vec<(u16, Board)>, Vec<Board>) {
let (winning_boards, _) = nums nums.iter()
.iter() // Reduce nums list to a vector of tuples => (winner_boards, remaining_boards)
// Reduce nums list to a tuple of (winner_boards, remaining_boards)
// On each iteration we add the new winners to the winner_boards list // On each iteration we add the new winners to the winner_boards list
// and remove them from the remaining_boards list // and remove them from the remaining_boards list
.fold((vec![], Vec::from(boards)), |(winners, remaining), &num| { .fold((vec![], Vec::from(boards)), |(winners, remaining), &num| {
@ -45,6 +44,5 @@ fn play_game(nums: &[u16], boards: &[Board]) -> Vec<(u16, Board)> {
winners.into_iter().chain(round_winners).collect(), winners.into_iter().chain(round_winners).collect(),
non_winners.collect(), non_winners.collect(),
) )
}); })
winning_boards
} }