Rework day 1

Simplify part 2 a lot, by not actually computing the sums because they
do not matter, only the changes do. Also eliminate the allocation
overhead while parsing line-by-line input.

Fixes the existing clippy error because the offending line no longer
exists.
This commit is contained in:
2021-12-01 20:35:27 +01:00
parent f413b08da6
commit 938eda0d22
3 changed files with 51 additions and 22 deletions

45
2021/src/common.rs Normal file
View File

@@ -0,0 +1,45 @@
use std::io::BufRead;
use std::io::BufReader;
use std::io::Read;
use std::marker::PhantomData;
use std::str::FromStr;
/// Line-based iterator/parser
///
/// For each line of the input, attempt to parse it as the requested type. Iteration is stopped on
/// the first IO error or parse error, silently. Leading and trailing whitespace is stripped before
/// attempting to parse.
pub struct LineParser<'a, I>
where
I: FromStr,
{
reader: BufReader<&'a mut dyn Read>,
buffer: String,
_data: PhantomData<I>,
}
impl<'a, I: FromStr> LineParser<'a, I> {
pub fn new(input: &'a mut dyn Read) -> Self {
Self {
reader: BufReader::new(input),
buffer: String::new(),
_data: PhantomData,
}
}
fn next_line(&mut self) -> Option<&str> {
self.buffer.clear();
self.reader.read_line(&mut self.buffer).ok()?;
Some(self.buffer.trim())
}
}
impl<'a, I: FromStr> Iterator for LineParser<'a, I> {
type Item = I;
fn next(&mut self) -> Option<Self::Item> {
self.next_line()?.parse().ok()
}
}

View File

@@ -1,15 +1,9 @@
use std::io::BufRead;
use std::io::BufReader;
use std::io::Read; use std::io::Read;
fn read_input(input: &mut dyn Read) -> Vec<u32> { use crate::common::LineParser;
let reader = BufReader::new(input);
// TODO: optimize allocations out fn read_input(input: &mut dyn Read) -> Vec<u32> {
reader LineParser::new(input).collect()
.lines()
.map(|l| l.unwrap().parse().unwrap())
.collect()
} }
pub fn part1(input: &mut dyn Read) -> String { pub fn part1(input: &mut dyn Read) -> String {
@@ -25,20 +19,9 @@ pub fn part1(input: &mut dyn Read) -> String {
pub fn part2(input: &mut dyn Read) -> String { pub fn part2(input: &mut dyn Read) -> String {
let numbers = read_input(input); let numbers = read_input(input);
let mut last = None;
numbers numbers
.windows(3) .windows(4)
.filter(|w| { .filter(|w| w[3] > w[0])
let sum: u32 = w.iter().sum();
let prev = last.replace(sum);
match prev {
Some(n) if n < sum => true,
_ => false,
}
})
.count() .count()
.to_string() .to_string()
} }

View File

@@ -2,6 +2,7 @@ use std::io::Read;
type Solution = fn(&mut dyn Read) -> String; type Solution = fn(&mut dyn Read) -> String;
mod common;
mod day01; mod day01;
mod day02; mod day02;
mod day03; mod day03;