feat: added a generic version of the intcode-program-executor

ankjevel · ankjevel · commit 11ec72316997 · 2020-12-05T12:06:18.000+01:00
diff --git a/day_09/src/program.rs b/day_09/src/program.rs
@@ -230,3 +230,19 @@ pub fn exec(memory: Vec<i64>, output: Option<Vec<i64>>) -> i64 {
 
     handle.join().unwrap()
 }
+
+pub fn run<F: Send + Sync + 'static, T: Send + Sync + 'static>(input: &Vec<i64>, fun: F) -> T
+where
+    F: Fn(Receiver<i64>, Sender<i64>) -> T,
+{
+    let (b_sender, a_receiver) = channel();
+    let (a_sender, b_receiver) = channel();
+
+    let mut program = Program::new(input);
+
+    program.new_input(b_receiver);
+    program.new_output(b_sender);
+
+    spawn(move || program.run());
+    spawn(move || fun(a_receiver, a_sender)).join().unwrap()
+}
diff --git a/day_15/src/main.rs b/day_15/src/main.rs
@@ -1,24 +1,13 @@
 use ::day_15::{parse_input, repair_droid::RepairDroid};
-use day_09::program::Program;
-use std::{sync::mpsc::channel, thread::spawn};
+use day_09::program::run;
 
 fn main() {
     let input = parse_input(&include_str!("../../input/day_15"));
-
-    println!("{:?}", part_01(&input));
+    println!("part_01: {}", part_01(&input));
 }
 
 fn part_01(input: &Vec<i64>) -> usize {
-    let (b_sender, a_receiver) = channel();
-    let (a_sender, b_receiver) = channel();
-
-    let mut program = Program::new(&input);
-
-    program.new_input(b_receiver);
-    program.new_output(b_sender);
-
-    spawn(move || program.run());
-    spawn(move || RepairDroid::new(a_receiver, a_sender).run())
-        .join()
-        .unwrap()
+    run(&input, |reciever, sender| -> usize {
+        RepairDroid::new(reciever, sender).run()
+    })
 }
diff --git a/day_15/src/repair_droid.rs b/day_15/src/repair_droid.rs
@@ -114,12 +114,12 @@ impl RepairDroid {
 
             if let Some(elem) = grid.get_mut(y) {
                 elem[x] = if start {
-                    '☆'
+                    'S'
                 } else if end {
-                    '★'
+                    'E'
                 } else {
                     match tile {
-                        Tile::Current => 'D',
+                        Tile::Current => 'C',
                         Tile::Wall => '#',
                         Tile::Visited => '.',
                         _ => ' ',
@@ -138,11 +138,11 @@ impl RepairDroid {
 
                 if let Some(elem) = grid.get_mut(y) {
                     elem[x] = if start {
-                        '☆'
+                        'S'
                     } else if end {
-                        '★'
+                        'E'
                     } else {
-                        'x'
+                        ' '
                     };
                 }
             }
