|
@@ -5,6 +5,7 @@ use std::fmt;
|
5
|
5
|
use std::fs;
|
6
|
6
|
use std::result;
|
7
|
7
|
use std::str::FromStr;
|
|
8
|
+use std::collections::VecDeque;
|
8
|
9
|
|
9
|
10
|
use regex::Regex;
|
10
|
11
|
|
|
@@ -47,8 +48,7 @@ impl FromStr for GameParameters {
|
47
|
48
|
#[derive(Debug, PartialEq)]
|
48
|
49
|
struct GameState {
|
49
|
50
|
turn: Option<usize>,
|
50
|
|
- circle: Vec<usize>,
|
51
|
|
- current_marble_index: usize,
|
|
51
|
+ circle: VecDeque<usize>,
|
52
|
52
|
current_marble: usize,
|
53
|
53
|
player_scores: Vec<usize>,
|
54
|
54
|
}
|
|
@@ -57,13 +57,28 @@ impl GameState {
|
57
|
57
|
fn new(parameters: GameParameters) -> GameState {
|
58
|
58
|
GameState {
|
59
|
59
|
turn: None,
|
60
|
|
- circle: vec![0],
|
61
|
|
- current_marble_index: 0,
|
|
60
|
+ circle: VecDeque::from(vec![0]),
|
62
|
61
|
current_marble: 0,
|
63
|
62
|
player_scores: vec![0; parameters.players as usize],
|
64
|
63
|
}
|
65
|
64
|
}
|
66
|
65
|
|
|
66
|
+ fn rotate_clockwise(&mut self, steps: usize) {
|
|
67
|
+ for _ in 0..steps {
|
|
68
|
+ if let Some(marble) = self.circle.pop_back() {
|
|
69
|
+ self.circle.push_front(marble);
|
|
70
|
+ }
|
|
71
|
+ }
|
|
72
|
+ }
|
|
73
|
+
|
|
74
|
+ fn rotate_counter_clockwise(&mut self, steps: usize) {
|
|
75
|
+ for _ in 0..steps {
|
|
76
|
+ if let Some(marble) = self.circle.pop_front() {
|
|
77
|
+ self.circle.push_back(marble);
|
|
78
|
+ }
|
|
79
|
+ }
|
|
80
|
+ }
|
|
81
|
+
|
67
|
82
|
fn play_until_marble(&mut self, last_marble: usize) {
|
68
|
83
|
for _ in 0..last_marble {
|
69
|
84
|
self.turn = match self.turn {
|
|
@@ -81,33 +96,19 @@ impl GameState {
|
81
|
96
|
|
82
|
97
|
fn place_next_marble(&mut self) {
|
83
|
98
|
self.current_marble += 1;
|
84
|
|
- if self.current_marble_index == self.circle.len() - 1 {
|
85
|
|
- self.current_marble_index = 1;
|
86
|
|
- self.circle
|
87
|
|
- .insert(self.current_marble_index, self.current_marble);
|
88
|
|
- } else {
|
89
|
|
- self.current_marble_index += 2;
|
90
|
|
- self.circle
|
91
|
|
- .insert(self.current_marble_index, self.current_marble);
|
92
|
|
- }
|
|
99
|
+ self.rotate_counter_clockwise(1);
|
|
100
|
+ self.circle.push_back(self.current_marble);
|
93
|
101
|
}
|
94
|
102
|
|
95
|
103
|
fn place_23rd_marble(&mut self) {
|
96
|
104
|
self.current_marble += 1;
|
97
|
105
|
|
98
|
|
- let mut remove_marble_index: i32 = self.current_marble_index as i32 - 7;
|
99
|
|
- if remove_marble_index < 0 {
|
100
|
|
- remove_marble_index += self.circle.len() as i32;
|
101
|
|
- }
|
102
|
|
- let removed_marble = self.circle.remove(remove_marble_index as usize);
|
103
|
|
-
|
104
|
|
- self.player_scores[self.turn.unwrap()] += removed_marble + self.current_marble;
|
105
|
|
-
|
106
|
|
- let mut new_current_mable_index: i32 = self.current_marble_index as i32 - 7;
|
107
|
|
- if new_current_mable_index < 0 {
|
108
|
|
- new_current_mable_index += self.circle.len() as i32 + 1;
|
|
106
|
+ self.player_scores[self.turn.unwrap()] += self.current_marble;
|
|
107
|
+ self.rotate_clockwise(7);
|
|
108
|
+ if let Some(marble) = self.circle.pop_back() {
|
|
109
|
+ self.player_scores[self.turn.unwrap()] += marble;
|
109
|
110
|
}
|
110
|
|
- self.current_marble_index = new_current_mable_index as usize;
|
|
111
|
+ self.rotate_counter_clockwise(1);
|
111
|
112
|
}
|
112
|
113
|
|
113
|
114
|
fn highest_score(&mut self) -> usize {
|
|
@@ -122,7 +123,7 @@ impl fmt::Display for GameState {
|
122
|
123
|
Some(turn) => write!(f, "[{}] ", turn + 1)?,
|
123
|
124
|
}
|
124
|
125
|
for (index, marble) in self.circle.iter().enumerate() {
|
125
|
|
- if index == self.current_marble_index {
|
|
126
|
+ if index == self.circle.len() - 1 {
|
126
|
127
|
write!(f, "({}) ", marble)?;
|
127
|
128
|
} else {
|
128
|
129
|
write!(f, "{} ", marble)?;
|
|
@@ -137,6 +138,12 @@ pub fn solve_part1() -> Result<usize> {
|
137
|
138
|
Ok(get_highest_score_for_game(game_params))
|
138
|
139
|
}
|
139
|
140
|
|
|
141
|
+pub fn solve_part2() -> Result<usize> {
|
|
142
|
+ let mut game_params = read_game_parameters(INPUT)?;
|
|
143
|
+ game_params.last_marble *= 100;
|
|
144
|
+ Ok(get_highest_score_for_game(game_params))
|
|
145
|
+}
|
|
146
|
+
|
140
|
147
|
fn read_game_parameters(filename: &str) -> Result<GameParameters> {
|
141
|
148
|
let game_params = fs::read_to_string(filename)?;
|
142
|
149
|
Ok(game_params.parse()?)
|