feat: added part 1 of day 11

ankjevel · ankjevel · commit 997e8fa1cf76 · 2020-12-05T12:06:18.000+01:00
diff --git a/day_11/src/main.rs b/day_11/src/main.rs
@@ -2,25 +2,76 @@ use ::day_11::{painting_robot::Robot, parse_input};
 use day_09::program::Program;
 use std::{sync::mpsc::channel, thread::spawn};
 
-fn main() {
+fn part_01(input: &Vec<i64>) -> usize {
     let (b_sender, a_receiver) = channel();
     let (a_sender, b_receiver) = channel();
 
-    let mut program = Program::new(&parse_input(&include_str!("../../input/day_11")));
-    let mut robot = Robot::new(a_receiver, a_sender);
+    let mut program = Program::new(input);
+    let mut robot = Robot::new(a_receiver, a_sender, false);
 
     spawn(move || {
         program.new_input(b_receiver);
         program.new_output(b_sender);
         program.run();
     });
 
-    let part_01_output = spawn(move || robot.run()).join().unwrap();
-    println!("part_01, {}", part_01_output);
-    // let mut robot = Robot::new(&instructions);
-    // println!("part_01: {:?}", robot.run());
+    spawn(move || robot.run()).join().unwrap()
+}
+
+fn main() {
+    let input = parse_input(&include_str!("../../input/day_11"));
+    println!("part_01: {:?}", part_01(&input));
 }
 
 #[cfg(test)]
 #[allow(dead_code)]
-mod tests {}
+mod tests {
+    use super::*;
+
+    #[test]
+    #[ignore]
+    fn gets_the_same_result_as_part_01() {
+        let (b_sender, a_receiver) = channel();
+        let (a_sender, _b_receiver) = channel();
+
+        for input in vec![0, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, -1] {
+            b_sender.send(input).unwrap()
+        }
+
+        let mut robot = Robot::new(a_receiver, a_sender, false);
+
+        let result = spawn(move || robot.run()).join().unwrap();
+
+        assert_eq!(result, 6);
+    }
+
+    #[test]
+    fn it_does_not_count_the_same_spot_twice() {
+        let (b_sender, a_receiver) = channel();
+        let (a_sender, b_receiver) = channel();
+
+        let output_thread = spawn(move || {
+            let mut output = vec![];
+            loop {
+                let new_output = match b_receiver.recv() {
+                    Ok(val) => val,
+                    _ => break,
+                };
+                &output.push(new_output);
+            }
+            output.to_owned()
+        });
+
+        for input in vec![0, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0, -1] {
+            b_sender.send(input).unwrap()
+        }
+
+        let mut robot = Robot::new(a_receiver, a_sender, false);
+
+        let result = spawn(move || robot.run()).join().unwrap();
+
+        assert_eq!(output_thread.join().unwrap(), vec![0, 0, 0, 0, 0, 0, 0]);
+
+        assert_eq!(result, 6);
+    }
+}
diff --git a/day_11/src/painting_robot.rs b/day_11/src/painting_robot.rs
@@ -15,13 +15,16 @@ pub struct Robot {
 }
 
 impl Robot {
-    pub fn new(receiver: Receiver<i64>, sender: Sender<i64>) -> Robot {
+    pub fn new(receiver: Receiver<i64>, sender: Sender<i64>, start_on_white: bool) -> Robot {
         let position = Point { x: 0, y: 0 };
         let mut visited = HashSet::new();
         let mut whites = HashSet::new();
 
         visited.insert(position.clone());
-        whites.insert(position.clone());
+
+        if start_on_white {
+            whites.insert(position.clone());
+        }
 
         Robot {
             input: receiver,
@@ -64,6 +67,8 @@ impl Robot {
                 self.whites.insert(self.position.clone());
             }
 
+            self.visited.insert(self.position.clone());
+
             let next_position = match self.input.recv() {
                 Ok(0) => 0u8,
                 Ok(1) => 1u8,
@@ -72,7 +77,6 @@ impl Robot {
 
             self.direction.turn(next_position);
             self.move_position();
-            self.visited.insert(self.position.clone());
         }
 
         self.visited.len()
