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

Clean up.

Browse Source
This commit is contained in:
Bert Peters
2018-12-17 08:33:16 +01:00
parent f175584ccf
commit a632bdff10
2 changed files with 25 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
2018/src/day17.rs
View File

@@ -60,33 +60,6 @@ impl Day17 {
};
}
#[allow(unused)]
fn map(&self) {
let (xmin, xmax) = match self.clays.iter().map(|(x, _)| *x).minmax() {
MinMaxResult::MinMax(a, b) => (a, b),
_ => panic!(),
};
println!("{}, {} to {}, {}", xmin, self.ymin, xmax, self.ymax);
for y in self.ymin..=self.ymax {
let mut buf = String::with_capacity(xmax - xmin + 1);
for x in xmin..=xmax {
let pos = (x, y);
if self.clays.contains(&pos) {
buf.push('#');
} else if self.contained.contains(&pos) {
buf.push('~');
} else if self.flowing.contains(&pos) {
buf.push('|');
} else {
buf.push(' ');
}
}
println!("{}", buf);
}
}
fn descend(&mut self, pos: Coordinate) {
let (x, y) = pos;
@@ -152,25 +125,21 @@ impl Solution for Day17 {
fn part1(&mut self, input: &mut Read) -> String {
self.read_input(input);
self.descend((500, 0));
let range_filter = |&&(_, y): &&(usize, usize)| y >= self.ymin && y <= self.ymax;
let result = self.contained.iter().filter(range_filter).count()
+ self.flowing.iter().filter(range_filter).count();
let result = self.contained.iter()
.chain(self.flowing.iter())
.filter(|&&(_, y)| y >= self.ymin && y <= self.ymax).count();
format!("{}", result)
}
fn part2(&mut self, input: &mut Read) -> String {
self.read_input(input);
self.descend((500, 0));
let range_filter = |&&(_, y): &&(usize, usize)| y >= self.ymin && y <= self.ymax;
let result = self.contained.iter().filter(range_filter).count();
let result = self.contained.iter()
.filter(|&&(_, y)| y >= self.ymin && y <= self.ymax).count();
format!("{}", result)
}
}