alarsyo/advent-of-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

2020: day23: refacto cup access

Browse source
This commit is contained in:
Antoine Martin 2020-12-24 01:25:42 +01:00
parent e341008746
commit 022ca7daab
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
aoc2020/src/day23.rs
View file

@ -33,8 +33,8 @@ fn part2(input: &str) -> Result<usize> {
cup_circle.step(); cup_circle.step();
} }
let first = cup_circle.get_next_cup(1); let first = *cup_circle.next_cup(1);
let second = cup_circle.get_next_cup(first); let second = *cup_circle.next_cup(first);
Ok(first * second) Ok(first * second)
} }
@ -165,21 +165,21 @@ struct FastCupCircle {
} }
impl FastCupCircle { impl FastCupCircle {
fn get_next_cup(&self, cup: usize) -> usize { fn next_cup(&self, cup: usize) -> &usize {
self.cups[cup - 1] &self.cups[cup - 1]
} }
fn set_next_cup(&mut self, cup: usize, next: usize) { fn next_cup_mut(&mut self, cup: usize) -> &mut usize {
self.cups[cup - 1] = next; &mut self.cups[cup - 1]
} }
fn remove_next_3(&mut self, cup: usize) -> [usize; 3] { fn remove_next_3(&mut self, cup: usize) -> [usize; 3] {
let first = self.get_next_cup(cup); let first = *self.next_cup(cup);
let second = self.get_next_cup(first); let second = *self.next_cup(first);
let third = self.get_next_cup(second); let third = *self.next_cup(second);
// shortcut the links to remove them from the loop temporarily // shortcut the links to remove them from the loop temporarily
self.set_next_cup(cup, self.get_next_cup(third)); *self.next_cup_mut(cup) = *self.next_cup(third);
[first, second, third] [first, second, third]
} }
@ -215,12 +215,12 @@ impl FastCupCircle {
// The links from first to second and from second to third haven't changed, no need to // The links from first to second and from second to third haven't changed, no need to
// update them // update them
let [first, _, third] = removed_cups; let [first, _, third] = removed_cups;
self.set_next_cup(third, self.get_next_cup(destination)); *self.next_cup_mut(third) = *self.next_cup(destination);
self.set_next_cup(destination, first); *self.next_cup_mut(destination) = first;
// The crab selects a new current cup: the cup which is immediately clockwise of the current // The crab selects a new current cup: the cup which is immediately clockwise of the current
// cup. // cup.
self.current = self.get_next_cup(self.current); self.current = *self.next_cup(self.current);
} }
} }