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

Add peek for next operation to intcode

This commit is contained in:
kageru 2019-12-13 10:33:16 +01:00
parent 2ee1c8779d
commit 1d164979c6
2 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
2019/intcode/src/intcomputer.rs
View File

@ -52,6 +52,14 @@ impl IntComputer {
outputs outputs
} }
pub fn peek_operation(&mut self) -> Operation {
if self.cmd_buffer.is_empty() {
let next = self.decode_next();
self.cmd_buffer.push(next);
}
self.cmd_buffer[0].clone()
}
#[rustfmt::skip] #[rustfmt::skip]
fn get_next(&mut self, mode: Mode) -> i64 { fn get_next(&mut self, mode: Mode) -> i64 {
let value = *self.tape.get(self.pos as usize).unwrap(); let value = *self.tape.get(self.pos as usize).unwrap();
@ -179,7 +187,7 @@ fn get_mode(raw_opcode: &[char], pos: ParameterPosition) -> Mode {
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
enum Operation { pub enum Operation {
Add { Add {
x: i64, x: i64,
y: i64, y: i64,

36
2019/intcode/src/tests.rs
View File

@ -93,19 +93,11 @@ fn test_position_equals() {
#[test] #[test]
fn test_immediate_less_than() { fn test_immediate_less_than() {
assert_eq!( assert_eq!(
run_for_input( run_for_input(&parse_test_input("3,3,1107,-1,8,3,4,3,99"), &mut 0, vec![8]),
&parse_test_input("3,3,1107,-1,8,3,4,3,99"),
&mut 0,
vec![8]
),
0 0
); );
assert_eq!( assert_eq!(
run_for_input( run_for_input(&parse_test_input("3,3,1107,-1,8,3,4,3,99"), &mut 0, vec![7]),
&parse_test_input("3,3,1107,-1,8,3,4,3,99"),
&mut 0,
vec![7]
),
1 1
); );
} }
@ -113,19 +105,11 @@ fn test_immediate_less_than() {
#[test] #[test]
fn test_immediate_equals() { fn test_immediate_equals() {
assert_eq!( assert_eq!(
run_for_input( run_for_input(&parse_test_input("3,3,1108,-1,8,3,4,3,99"), &mut 0, vec![8]),
&parse_test_input("3,3,1108,-1,8,3,4,3,99"),
&mut 0,
vec![8]
),
1 1
); );
assert_eq!( assert_eq!(
run_for_input( run_for_input(&parse_test_input("3,3,1108,-1,8,3,4,3,99"), &mut 0, vec![7]),
&parse_test_input("3,3,1108,-1,8,3,4,3,99"),
&mut 0,
vec![7]
),
0 0
); );
} }
@ -133,14 +117,14 @@ fn test_immediate_equals() {
#[test] #[test]
fn test_quine() { fn test_quine() {
assert_eq!( assert_eq!(
run_for_input( IntComputer::new(
&parse_test_input("109,1,204,-1,1001,100,1,100,1008,100,16,101,1006,101,0,99"), parse_test_input("109,1,204,-1,1001,100,1,100,1008,100,16,101,1006,101,0,99"),
&mut 0, 0,
vec![0] vec![0]
), )
99 .get_all_outputs(),
vec![109, 1, 204, -1, 1001, 100, 1, 100, 1008, 100, 16, 101, 1006, 101, 0, 99]
); );
//"109,1,204,-1,1001,100,1,100,1008,100,16,101,1006,101,0,99"
} }
#[test] #[test]