valeth/advent-of-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update solution for 2022 day 10

Browse Source 
Move tested outputs into files
Make some micro-adjustments to code
This commit is contained in:
Patrick Auernig 2022-12-10 15:17:35 +01:00
parent 37eb9e1ab6
commit dcbed83ea4
4 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
2022/day-10/outputs/part_two/puzzle.txt Normal file
View File

@ -0,0 +1,6 @@
###..####.#..#.####..##..###..####.####.
#..#.#....#.#.....#.#..#.#..#.#....#....
#..#.###..##.....#..#....#..#.###..###..
###..#....#.#...#...#....###..#....#....
#.#..#....#.#..#....#..#.#....#....#....
#..#.#....#..#.####..##..#....####.#....

6
2022/day-10/outputs/part_two/test.txt Normal file
View File

@ -0,0 +1,6 @@
##..##..##..##..##..##..##..##..##..##..
###...###...###...###...###...###...###.
####....####....####....####....####....
#####.....#####.....#####.....#####.....
######......######......######......####
#######.......#######.......#######.....

6
2022/day-10/src/bin/part_one.rs
View File

@ -15,9 +15,9 @@ fn main() -> io::Result<()> {
fn solve(path: &str) -> io::Result<i64> { fn solve(path: &str) -> io::Result<i64> {
let instructions = parse_input(path)?; let instructions = parse_input(path)?;
let mut cycles_total = 0; let mut cycles_total: i64 = 0;
let mut reg_x = 1; let mut reg_x: i64 = 1;
let mut sig_strength_total = 0; let mut sig_strength_total: i64 = 0;
for instruction in instructions { for instruction in instructions {
let (cycles, add_x) = match instruction { let (cycles, add_x) = match instruction {

28
2022/day-10/src/bin/part_two.rs
View File

@ -22,8 +22,8 @@ fn solve(path: &str) -> io::Result<String> {
let mut crt = Vec::<[char; 40]>::new(); let mut crt = Vec::<[char; 40]>::new();
let mut crt_row = [PIXEL_UNLIT; 40]; let mut crt_row = [PIXEL_UNLIT; 40];
let mut cycles_total = 0; let mut cycles_total: i64 = 0;
let mut reg_x = 1_i64; let mut reg_x: i64 = 1;
for instruction in instructions { for instruction in instructions {
let (cycles, add_x) = match instruction { let (cycles, add_x) = match instruction {
@ -34,7 +34,7 @@ fn solve(path: &str) -> io::Result<String> {
for _ in 0..cycles { for _ in 0..cycles {
let cur_row_pos = cycles_total % DRAW_CYCLE; let cur_row_pos = cycles_total % DRAW_CYCLE;
if (reg_x - 1..=reg_x + 1).contains(&cur_row_pos) { if ((reg_x - 1)..=(reg_x + 1)).contains(&cur_row_pos) {
crt_row[cur_row_pos as usize] = PIXEL_LIT; crt_row[cur_row_pos as usize] = PIXEL_LIT;
} }
@ -52,8 +52,8 @@ fn solve(path: &str) -> io::Result<String> {
let lines = crt let lines = crt
.iter() .iter()
.map(|elem| elem.iter().collect::<String>()) .map(|elem| elem.iter().collect::<String>())
.collect::<Vec<_>>() .reduce(|acc, elem| acc + "\n" + &elem)
.join("\n"); .unwrap();
Ok(lines) Ok(lines)
} }
@ -64,28 +64,14 @@ mod test {
#[test] #[test]
fn sample() { fn sample() {
const OUTPUT: &str = "\ const OUTPUT: &str = include_str!("../../outputs/part_two/test.txt");
##..##..##..##..##..##..##..##..##..##..
###...###...###...###...###...###...###.
####....####....####....####....####....
#####.....#####.....#####.....#####.....
######......######......######......####
#######.......#######.......#######.....";
let result = solve("inputs/test.txt").unwrap(); let result = solve("inputs/test.txt").unwrap();
assert_eq!(OUTPUT, &result) assert_eq!(OUTPUT, &result)
} }
#[test] #[test]
fn puzzle() { fn puzzle() {
const OUTPUT: &str = "\ const OUTPUT: &str = include_str!("../../outputs/part_two/puzzle.txt");
###..####.#..#.####..##..###..####.####.
#..#.#....#.#.....#.#..#.#..#.#....#....
#..#.###..##.....#..#....#..#.###..###..
###..#....#.#...#...#....###..#....#....
#.#..#....#.#..#....#..#.#....#....#....
#..#.#....#..#.####..##..#....####.#....";
let result = solve("inputs/puzzle.txt").unwrap(); let result = solve("inputs/puzzle.txt").unwrap();
assert_eq!(OUTPUT, result); assert_eq!(OUTPUT, result);
} }