fun/advent-of-code-2022-rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[CLEANUP] Removed duplicate code in Day 10

Browse Source
This commit is contained in:
Bas Dado
2022-12-11 20:08:48 +01:00
parent afa80765cf
commit e33875103f
1 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/day10.rs
View File

@@ -28,23 +28,14 @@ impl Day10 {
.collect(),
}
}
}
impl DaySolver for Day10 {
fn solve_part1(&mut self) -> String {
let mut x = 1;
fn execute<F>(&self, mut cycle_fun: F) where F: FnMut(&i32, &i32) {
let mut x: i32 = 1;
let mut cycle = 1;
let mut interesting_cycle_sum = 0;
for instr in &self.instructions {
for _ in 0..instr.cycles() {
if (cycle + 20) % 40 == 0 {
// println!("{} * {} = {}", x, cycle, x * cycle);
interesting_cycle_sum += x * cycle;
}
cycle_fun(&cycle, &x);
cycle += 1;
}
@@ -52,17 +43,28 @@ impl DaySolver for Day10 {
x += addx;
}
}
}
}
impl DaySolver for Day10 {
fn solve_part1(&mut self) -> String {
let mut interesting_cycle_sum = 0;
self.execute(|cycle, x| {
if (cycle + 20) % 40 == 0 {
// println!("{} * {} = {}", x, cycle, x * cycle);
interesting_cycle_sum += x * cycle;
}
});
return interesting_cycle_sum.to_string();
}
fn solve_part2(&mut self) -> String {
let mut x: i32 = 1;
let mut cycle = 1;
let mut res: String = String::from("\n");
for instr in &self.instructions {
for _ in 0..instr.cycles() {
let mut res = String::from("\n");
self.execute(|cycle, x| {
if x.abs_diff((cycle - 1) % 40) <= 1 {
res += "#";
} else {
@@ -71,13 +73,7 @@ impl DaySolver for Day10 {
if cycle % 40 == 0 {
res += "\n";
}
cycle += 1;
}
if let Instruction::Addx(addx) = instr {
x += addx;
}
}
});
return res;
}