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

Correct formatting.

Browse Source
This commit is contained in:
Bert Peters
2019-02-18 15:13:48 +01:00
parent 171d9fa2e9
commit c16ef40d73
28 changed files with 316 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
2018/src/day07.rs
View File

@@ -18,8 +18,7 @@ struct Worker {
impl Ord for Worker {
fn cmp(&self, other: &Self) -> Ordering {
other.time.cmp(&self.time)
.then(other.work.cmp(&self.work))
other.time.cmp(&self.time).then(other.work.cmp(&self.work))
}
}
@@ -55,11 +54,19 @@ impl Day07 {
}
}
fn part2_parametrized(&mut self, input: &mut Read, base_time: usize, max_workers: usize) -> usize {
fn part2_parametrized(
&mut self,
input: &mut Read,
base_time: usize,
max_workers: usize,
) -> usize {
self.read_edges(input);
let mut starting_points: BinaryHeap<Reverse<char>> = self.forward.keys()
let mut starting_points: BinaryHeap<Reverse<char>> = self
.forward
.keys()
.filter(|&x| !self.dep_count.contains_key(x))
.map(|&x| Reverse(x)).collect();
.map(|&x| Reverse(x))
.collect();
let mut workers: BinaryHeap<Worker> = BinaryHeap::new();
let mut time = 0;
@@ -106,8 +113,12 @@ impl Solution for Day07 {
let mut result = String::new();
let mut starting_points: BinaryHeap<_> = self.forward.keys().filter(|&x| !self.dep_count.contains_key(x))
.map(|&x| Reverse(x)).collect();
let mut starting_points: BinaryHeap<_> = self
.forward
.keys()
.filter(|&x| !self.dep_count.contains_key(x))
.map(|&x| Reverse(x))
.collect();
while let Some(Reverse(c)) = starting_points.pop() {
result.push(c);