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

Fix day 24 part 2.

Browse Source
This commit is contained in:
Bert Peters
2018-12-26 10:11:33 +01:00
parent 20e7117b6c
commit d0b325ba6f
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
2018/src/day24.rs
View File

@@ -114,7 +114,7 @@ impl Day24 {
} }
let damage = self.units.iter().map(|x| unit.damage_to(x)).collect_vec(); let damage = self.units.iter().map(|x| unit.damage_to(x)).collect_vec();
let target = (0..self.units.len()) let target = (0..self.units.len())
.filter(|&x| !is_targeted[x] && self.units[x].faction != unit.faction && self.units[x].is_alive()) .filter(|&x| !is_targeted[x] && self.units[x].faction != unit.faction && self.units[x].is_alive() && damage[x] > 0)
.max_by_key(|&x| (damage[x], self.units[x].effective_power(), self.units[x].initiative)); .max_by_key(|&x| (damage[x], self.units[x].effective_power(), self.units[x].initiative));
if let Some(target) = target { if let Some(target) = target {
@@ -198,7 +198,6 @@ impl Solution for Day24 {
} }
self.full_simulation(); self.full_simulation();
let result: u32 = self.units.iter().map(|x| x.count).sum();
if self.faction_won('D') { if self.faction_won('D') {
let result: u32 = self.units.iter().map(|x| x.count).sum(); let result: u32 = self.units.iter().map(|x| x.count).sum();
return result.to_string(); return result.to_string();