day04 finished

This commit is contained in:
Ruediger Ludwig 2023-01-29 15:12:26 +01:00
parent d7c85a75f6
commit 33eb92e9d1
10 changed files with 1184 additions and 55 deletions

View file

@ -3,7 +3,7 @@ mod days;
mod macros;
use anyhow::Result;
use common::file::read_data;
use common::file::read_lines;
use days::{day_provider, DayTrait, ResultType};
use std::{
env,
@ -47,7 +47,7 @@ fn output(day: usize, part: usize, result: ResultType, time: Duration) -> () {
}
}
fn run_part(day: &Box<dyn DayTrait>, is_part1: bool, lines: &str) -> Result<Duration> {
fn run_part(day: &Box<dyn DayTrait>, is_part1: bool, lines: &[String]) -> Result<Duration> {
let now = Instant::now();
let result = if is_part1 {
day.part1(lines)?
@ -70,7 +70,7 @@ fn run_part(day: &Box<dyn DayTrait>, is_part1: bool, lines: &str) -> Result<Dura
}
fn run(day: &Box<dyn DayTrait>, part1: bool, part2: bool) -> Result<Duration> {
let lines = read_data(day.get_day_number(), "input.txt")?;
let lines = read_lines(day.get_day_number(), "input.txt")?;
let elapsed1 = if part1 {
run_part(day, true, &lines)?
} else {