diff --git a/2019/src/bin/day2.rs b/2019/src/bin/day2.rs index 6c79768..f68e375 100644 --- a/2019/src/bin/day2.rs +++ b/2019/src/bin/day2.rs @@ -27,7 +27,7 @@ fn main() -> io::Result<()> { Ok(()) } -fn run_program(program: &mut [i32], noun: i32, verb: i32) { +fn run_program(program: &mut [i64], noun: i64, verb: i64) { program[1] = noun; program[2] = verb; let mut addr = 0; @@ -50,7 +50,7 @@ fn run_program(program: &mut [i32], noun: i32, verb: i32) { } } -fn part2(target: i32, program: &[i32]) -> (i32, i32) { +fn part2(target: i64, program: &[i64]) -> (i64, i64) { for noun in 0..=99 { for verb in 0..=99 { let mut candidate = program.to_vec(); diff --git a/2019/src/bin/day7.rs b/2019/src/bin/day7.rs index 588e0c1..f8a3b9a 100644 --- a/2019/src/bin/day7.rs +++ b/2019/src/bin/day7.rs @@ -18,9 +18,9 @@ fn main() -> io::Result<()> { Ok(()) } -fn part1(data: Vec) { - let mut elements = [0i32; AMPLIFIERS]; - for i in 0i32..=4 { +fn part1(data: Vec) { + let mut elements = [0i64; AMPLIFIERS]; + for i in 0i64..=4 { elements[i as usize] = i; } let max = phase_settings(elements) @@ -42,9 +42,9 @@ fn part1(data: Vec) { println!("Part 1: {}", max); } -fn part2(data: Vec) { - let mut elements = [0i32; AMPLIFIERS]; - for i in 5i32..=9 { +fn part2(data: Vec) { + let mut elements = [0i64; AMPLIFIERS]; + for i in 5i64..=9 { elements[i as usize - 5] = i; } @@ -57,7 +57,7 @@ fn part2(data: Vec) { println!("Part 2: {}", max); } -fn run_part2_with_settings(data: Vec, settings: [i32; AMPLIFIERS]) -> i32 { +fn run_part2_with_settings(data: Vec, settings: [i64; AMPLIFIERS]) -> i64 { // Construct the amplifiers and the pipes between them // The first amplifier gets io_pipe as input // The last amplifier gets io_pipe as output @@ -112,15 +112,15 @@ fn run_part2_with_settings(data: Vec, settings: [i32; AMPLIFIERS]) -> i32 { io_pipe.last_value() } -fn phase_settings(mut elements: [i32; AMPLIFIERS]) -> Vec<[i32; AMPLIFIERS]> { +fn phase_settings(mut elements: [i64; AMPLIFIERS]) -> Vec<[i64; AMPLIFIERS]> { let mut permutations = Vec::new(); - let mut indexes = [0i32; AMPLIFIERS]; + let mut indexes = [0i64; AMPLIFIERS]; permutations.push(elements); let mut i = 0; while i < AMPLIFIERS { - if indexes[i] < i as i32 { + if indexes[i] < i as i64 { elements.swap(if i % 2 == 0 { 0 } else { indexes[i] as usize }, i); permutations.push(elements); indexes[i] += 1;