j00lz
/
AoC2021
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make the way boards are parsed more functional
continuous-integration/drone/push Build is passing Details

pull/1/head
Julius 2021-12-04 10:41:46 +01:00
parent 8a3ec2f2f1
commit 0074ccaf0f
Signed by: j00lz
GPG Key ID: AF241B0AA237BBA2
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/day04.rs
View File

@ -18,16 +18,13 @@ impl Day for Day04 {
let nums = first.split(',').map(|x| x.parse::<u32>().expect("wat?")).collect();
let split = l.split(|x| x.is_empty());
let mut boards = vec![];
for vecs in split {
let mut rows = vec![];
for vec in vecs {
let v = vec.split_ascii_whitespace().map(|x| x.parse::<u32>().expect("foo")).map(Option::Some).collect();
rows.push(v);
}
boards.push(Board(rows));
}
let boards = split.map(|vecs|
vecs.iter().map(
|vec| vec.split_ascii_whitespace().map(
|x| x.parse::<u32>().expect("foo")
).map(Option::Some).collect()).collect()
).map(Board).collect();
Day04 {
numbers: nums,
@ -58,11 +55,9 @@ impl Day for Day04 {
let len = boards.len();
for board in &mut boards {
let res = board.mark(number);
if res {
if len == 1 {
let s = board.unmarked_sum();
return format!("{}", s * number);
}
if res && len == 1 {
let s = board.unmarked_sum();
return format!("{}", s * number);
}
}
boards = boards.iter().filter(|x| !x.complete()).cloned().collect();
@ -132,11 +127,11 @@ impl Board {
#[cfg(test)]
mod tests {
use std::fs::read_to_string;
use crate::Day04;
use crate::day04::Board;
use crate::day::Day;
const INPUT: &str = r"7,4,9,5,11,17,23,2,0,14,21,24,10,16,13,6,15,25,12,22,18,20,8,19,3,26,1
22 13 17 11 0