bert/adventofcode
1
0
Fork 0
mirror of https://github.com/bertptrs/adventofcode.git synced 2025-12-25 12:50:32 +01:00
Code Issues Projects Releases Wiki Activity

Reduce code duplication.

Browse Source
This commit is contained in:
Bert Peters
2019-02-18 15:39:41 +01:00
parent c16ef40d73
commit 374eda945b
1 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
2018/src/day10.rs
View File

@@ -95,25 +95,8 @@ impl Day10 {
dist.checked_div(speed).unwrap_or(1).max(1)
}
}
impl Solution for Day10 {
fn part1(&mut self, input: &mut Read) -> String {
self.read_inputs(input);
let mut prev = self.height();
let initial = self.underestimate_time();
self.run(initial);
let mut height = self.height();
while height < prev {
prev = height;
self.run(1);
height = self.height();
}
self.run(-1);
self.print_state()
}
fn part2(&mut self, input: &mut Read) -> String {
fn simulate(&mut self, input: &mut Read) -> i32 {
self.read_inputs(input);
let mut prev = self.height();
let mut steps = self.underestimate_time();
@@ -126,7 +109,19 @@ impl Solution for Day10 {
self.run(1);
height = self.height();
}
(steps - 1).to_string()
self.run(-1);
steps - 1
}
}
impl Solution for Day10 {
fn part1(&mut self, input: &mut Read) -> String {
self.simulate(input);
self.print_state()
}
fn part2(&mut self, input: &mut Read) -> String {
self.simulate(input).to_string()
}
}