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

Reduce code duplication

Browse Source
This commit is contained in:
Bert Peters
2021-12-26 12:32:07 +01:00
parent d757c389f0
commit b2f9898714
1 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
2021/src/day21.rs
View File

@@ -5,23 +5,19 @@ use crate::common::LineIter;
fn read_input(input: &mut dyn Read) -> (i32, i32) { fn read_input(input: &mut dyn Read) -> (i32, i32) {
let mut reader = LineIter::new(input); let mut reader = LineIter::new(input);
let a = reader let mut helper = || {
reader
.next() .next()
.unwrap() .unwrap()
.split(' ') .split(' ')
.last() .last()
.unwrap() .unwrap()
.parse() .parse()
.unwrap(); .unwrap()
};
let b = reader let a = helper();
.next() let b = helper();
.unwrap()
.split(' ')
.last()
.unwrap()
.parse()
.unwrap();
(a, b) (a, b)
} }
@@ -46,7 +42,7 @@ fn find_repetition(mut pos: i32, mut die: i32) -> i32 {
pub fn part1(input: &mut dyn Read) -> String { pub fn part1(input: &mut dyn Read) -> String {
const TARGET_SCORE: i32 = 1000; const TARGET_SCORE: i32 = 1000;
let (a, b) = read_input(input); let (mut a, mut b) = read_input(input);
let a10 = find_repetition(a, 1); let a10 = find_repetition(a, 1);
let b10 = find_repetition(b, 4); let b10 = find_repetition(b, 4);
@@ -54,22 +50,21 @@ pub fn part1(input: &mut dyn Read) -> String {
let a_win = TARGET_SCORE / a10; let a_win = TARGET_SCORE / a10;
let b_win = TARGET_SCORE / b10; let b_win = TARGET_SCORE / b10;
let mut rolls = 3 * 20 * a_win.min(b_win); let win = a_win.min(b_win);
let mut a_score = rolls / 3 / 20 * a10; let mut a_score = win * a10;
let mut b_score = rolls / 3 / 20 * b10; let mut b_score = win * b10;
let mut a_pos = a;
let mut b_pos = b;
let mut die = 1; let mut die = 1;
let mut rolls = 3 * 20 * win;
let (loser_score, rolls) = if a_win < b_win { let (loser_score, rolls) = if a_win < b_win {
while a_score < TARGET_SCORE { while a_score < TARGET_SCORE {
a_pos = simulate(die, a_pos); a = simulate(die, a);
a_score += a_pos; a_score += a;
rolls += 3; rolls += 3;
if a_score < TARGET_SCORE { if a_score < TARGET_SCORE {
b_pos = simulate(die + 3, b_pos); b = simulate(die + 3, b);
b_score += b_pos; b_score += b;
rolls += 3; rolls += 3;
} }
@@ -79,11 +74,11 @@ pub fn part1(input: &mut dyn Read) -> String {
(b_score, rolls) (b_score, rolls)
} else { } else {
while b_score < TARGET_SCORE { while b_score < TARGET_SCORE {
a_pos = simulate(die, a_pos); a = simulate(die, a);
a_score += a_pos; a_score += a;
b_pos = simulate(die + 3, b_pos); b = simulate(die + 3, b);
b_score += b_pos; b_score += b;
rolls += 6; rolls += 6;