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

Clean up and simplify.

Browse Source 
The idea is that this makes it easier to debug. I'm not sure it does
yet.
This commit is contained in:
Bert Peters
2018-12-15 19:12:33 +01:00
parent 44e5c38268
commit ae51e3c114
1 changed files with 11 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
2018/src/day15.rs
View File

@@ -57,20 +57,13 @@ impl Day15 {
for (x, c) in line.chars().enumerate() { for (x, c) in line.chars().enumerate() {
match c { match c {
'#' => { current[x] = true; } '#' => { current[x] = true; }
'G' => { 'E' | 'G' => {
self.units.push(Unit { self.units.push(Unit {
pos: (y, x), pos: (y, x),
faction: 'G', faction: c,
..Default::default() ..Default::default()
}); });
self.alive[1] += 1; self.alive[if c == 'E' { 0 } else { 1 }] += 1;
}
'E' => {
self.units.push(Unit {
pos: (y, x),
..Default::default()
});
self.alive[0] += 1;
} }
'.' => {} '.' => {}
c => panic!("Invalid tile {}!", c), c => panic!("Invalid tile {}!", c),
@@ -84,7 +77,7 @@ impl Day15 {
let initial = self.units[unit].pos; let initial = self.units[unit].pos;
let faction = self.units[unit].faction; let faction = self.units[unit].faction;
let positions: HashSet<Coordinate> = self.units.iter() let enemy_positions: HashSet<Coordinate> = self.units.iter()
.filter(|x| x.faction != faction && x.is_alive()) .filter(|x| x.faction != faction && x.is_alive())
.map(|x| x.pos).collect(); .map(|x| x.pos).collect();
@@ -93,7 +86,7 @@ impl Day15 {
.map(|x| x.pos).collect(); .map(|x| x.pos).collect();
let mut todo = VecDeque::new(); let mut todo = VecDeque::new();
let mut prev = HashMap::new(); let mut prev: HashMap<Coordinate, Coordinate> = HashMap::new();
todo.push_back(initial); todo.push_back(initial);
@@ -107,24 +100,11 @@ impl Day15 {
for pos in &next { for pos in &next {
if !prev.contains_key(pos) && !self.walls[pos.0][pos.1] { if !prev.contains_key(pos) && !self.walls[pos.0][pos.1] {
prev.insert(*pos, (y, x)); if enemy_positions.contains(pos) {
if positions.contains(pos) { return prev.remove(&(y, x));
if (y, x) == initial { } else if !all_positions.contains(pos) {;
return None; let prev_step = *prev.get(&(y, x)).unwrap_or(pos);
} prev.insert(*pos, prev_step);
let mut next_pos = *pos;
// Found the nearest enemy
while let Some(prev_pos) = prev.get(&next_pos) {
if *prev_pos != initial {
next_pos = *prev_pos;
} else {
break;
}
}
return Some(next_pos);
} else if !all_positions.contains(pos) {
todo.push_back(*pos); todo.push_back(*pos);
} }
} }
@@ -173,7 +153,7 @@ impl Day15 {
if target.hp == 0 { if target.hp == 0 {
match target.faction { match target.faction {
'E' => { self.alive[0] -= 1 } 'E' => { self.alive[0] -= 1 }
'G' => { self.alive[1] -= 1 }, 'G' => { self.alive[1] -= 1 }
_ => panic!(), _ => panic!(),
}; };
} }
@@ -216,8 +196,6 @@ impl Solution for Day15 {
let mut rounds = 0; let mut rounds = 0;
while self.simulate() { while self.simulate() {
rounds += 1; rounds += 1;
//println!("Result after round {}: ", rounds);
//self.print();
} }
let result: usize = rounds * self.units.iter().map(|x| x.hp as usize) let result: usize = rounds * self.units.iter().map(|x| x.hp as usize)
.sum::<usize>(); .sum::<usize>();