alarsyo/advent-of-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

2019: intcode: rename method to get last output

Browse source
This commit is contained in:
Antoine Martin 2019-12-09 16:42:54 +01:00
parent 83fa28b21d
commit d02364731d
4 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
aoc2019/src/day05.rs
View file

@ -21,7 +21,7 @@ fn part1(input: &str) -> Result<i64> {
intcode.add_input(1); intcode.add_input(1);
intcode.run()?; intcode.run()?;
intcode intcode
.get_day05_output() .get_last_output()
.ok_or_else(|| err!("intcode gave no output")) .ok_or_else(|| err!("intcode gave no output"))
} }
@ -30,7 +30,7 @@ fn part2(input: &str) -> Result<i64> {
intcode.add_input(5); intcode.add_input(5);
intcode.run()?; intcode.run()?;
intcode intcode
.get_day05_output() .get_last_output()
.ok_or_else(|| err!("intcode gave no output")) .ok_or_else(|| err!("intcode gave no output"))
} }

2
aoc2019/src/day07.rs
View file

@ -58,7 +58,7 @@ fn part1(input: &str) -> Result<i64> {
intcode.run()?; intcode.run()?;
output = intcode output = intcode
.get_day05_output() .get_last_output()
.ok_or_else(|| err!("no output at end of pipeline!"))?; .ok_or_else(|| err!("no output at end of pipeline!"))?;
} }

4
aoc2019/src/day09.rs
View file

@ -24,7 +24,7 @@ fn part1(memory: Vec<i64>) -> Result<i64> {
intcode.add_input(1); intcode.add_input(1);
intcode.run()?; intcode.run()?;
intcode intcode
.get_day05_output() .get_last_output()
.ok_or_else(|| err!("intcode output was empty!")) .ok_or_else(|| err!("intcode output was empty!"))
} }
@ -34,7 +34,7 @@ fn part2(memory: Vec<i64>) -> Result<i64> {
intcode.add_input(2); intcode.add_input(2);
intcode.run()?; intcode.run()?;
intcode intcode
.get_day05_output() .get_last_output()
.ok_or_else(|| err!("intcode output was empty!")) .ok_or_else(|| err!("intcode output was empty!"))
} }

12
aoc2019/src/intcode/mod.rs
View file

@ -263,15 +263,7 @@ impl Intcode {
self.memory.get(0).copied() self.memory.get(0).copied()
} }
pub fn get_day05_output(&self) -> Option<i64> { pub fn get_last_output(&self) -> Option<i64> {
for (i, out) in self.output.iter().enumerate() { self.output.last().copied()
if i < self.output.len() - 1 {
assert_eq!(*out, 0);
} else {
return Some(*out);
}
}
None
} }
} }