wezm/advent-of-code
1
0
Fork 0
mirror of https://github.com/wezm/advent-of-code.git synced 2024-12-18 18:29:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix code broken by the move to i64

Browse source
This commit is contained in:
Wesley Moore 2019-12-09 17:05:54 +11:00
parent 6b9f91c100
commit 6a1b8b09e4
No known key found for this signature in database
GPG key ID: BF67766C0BC2D0EE
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
2019/src/bin/day2.rs
View file

@ -27,7 +27,7 @@ fn main() -> io::Result<()> {
Ok(()) 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[1] = noun;
program[2] = verb; program[2] = verb;
let mut addr = 0; 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 noun in 0..=99 {
for verb in 0..=99 { for verb in 0..=99 {
let mut candidate = program.to_vec(); let mut candidate = program.to_vec();

20
2019/src/bin/day7.rs
View file

@ -18,9 +18,9 @@ fn main() -> io::Result<()> {
Ok(()) Ok(())
} }
fn part1(data: Vec<i32>) { fn part1(data: Vec<i64>) {
let mut elements = [0i32; AMPLIFIERS]; let mut elements = [0i64; AMPLIFIERS];
for i in 0i32..=4 { for i in 0i64..=4 {
elements[i as usize] = i; elements[i as usize] = i;
} }
let max = phase_settings(elements) let max = phase_settings(elements)
@ -42,9 +42,9 @@ fn part1(data: Vec<i32>) {
println!("Part 1: {}", max); println!("Part 1: {}", max);
} }
fn part2(data: Vec<i32>) { fn part2(data: Vec<i64>) {
let mut elements = [0i32; AMPLIFIERS]; let mut elements = [0i64; AMPLIFIERS];
for i in 5i32..=9 { for i in 5i64..=9 {
elements[i as usize - 5] = i; elements[i as usize - 5] = i;
} }
@ -57,7 +57,7 @@ fn part2(data: Vec<i32>) {
println!("Part 2: {}", max); println!("Part 2: {}", max);
} }
fn run_part2_with_settings(data: Vec<i32>, settings: [i32; AMPLIFIERS]) -> i32 { fn run_part2_with_settings(data: Vec<i64>, settings: [i64; AMPLIFIERS]) -> i64 {
// Construct the amplifiers and the pipes between them // Construct the amplifiers and the pipes between them
// The first amplifier gets io_pipe as input // The first amplifier gets io_pipe as input
// The last amplifier gets io_pipe as output // The last amplifier gets io_pipe as output
@ -112,15 +112,15 @@ fn run_part2_with_settings(data: Vec<i32>, settings: [i32; AMPLIFIERS]) -> i32 {
io_pipe.last_value() 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 permutations = Vec::new();
let mut indexes = [0i32; AMPLIFIERS]; let mut indexes = [0i64; AMPLIFIERS];
permutations.push(elements); permutations.push(elements);
let mut i = 0; let mut i = 0;
while i < AMPLIFIERS { 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); elements.swap(if i % 2 == 0 { 0 } else { indexes[i] as usize }, i);
permutations.push(elements); permutations.push(elements);
indexes[i] += 1; indexes[i] += 1;