Try to modularize input

MLNW · Dec 3, 2023 · cf2e481 · cf2e481
1 parent 339685d
commit cf2e481
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 61 deletions.
diff --git a/2023-rust/src/bin/03.rs b/2023-rust/src/bin/03.rs
@@ -4,67 +4,6 @@ use regex::Regex;
 
 advent_of_code::solution!(3);
 
-#[derive(PartialEq, Eq, Hash, Clone, Copy)]
-struct Coordinate {
-    x: usize,
-    y: usize,
-}
-
-#[derive(Clone, Eq, PartialEq, Hash)]
-struct Symbol {
-    character: char,
-    position: Coordinate,
-}
-
-struct EnginePart {
-    number: u32,
-    start: Coordinate,
-    end: Coordinate,
-}
-
-impl EnginePart {
-    fn neighbors(&self) -> Vec<Coordinate> {
-        let mut neighbors: Vec<Coordinate> = Vec::new();
-
-        let y = self.start.y;
-        for x in self.start.x..self.end.x + 1 {
-            // left
-            if x > 0 && x == self.start.x {
-                neighbors.push(Coordinate { x: x - 1, y });
-                neighbors.push(Coordinate { x: x - 1, y: y + 1 });
-                if y > 0 {
-                    neighbors.push(Coordinate { x: x - 1, y: y - 1 });
-                }
-            }
-            // right
-            if x == self.end.x {
-                neighbors.push(Coordinate { x: x + 1, y });
-                neighbors.push(Coordinate { x: x + 1, y: y + 1 });
-                if y > 0 {
-                    neighbors.push(Coordinate { x: x + 1, y: y - 1 });
-                }
-            }
-            //top
-            if y > 0 {
-                neighbors.push(Coordinate { x, y: y - 1 });
-            }
-            //bottom
-            neighbors.push(Coordinate { x, y: y + 1 });
-        }
-
-        neighbors
-    }
-
-    pub fn neighboring_symbol(&self, symbols: &HashMap<Coordinate, Symbol>) -> Option<Symbol> {
-        for neighbor in self.neighbors() {
-            if let Some(symbol) = symbols.get(&neighbor) {
-                return Some(symbol.clone());
-            }
-        }
-        None
-    }
-}
-
 pub fn part_one(input: &str) -> Option<u32> {
     let parts = parse_engine_parts(input);
     let symbols: HashMap<Coordinate, Symbol> = parse_symbols(input, r"(\+|-|\*|/|=|\$|@|%|#|&)");

diff --git a/2023-rust/src/input/input_03.rs b/2023-rust/src/input/input_03.rs
@@ -0,0 +1,63 @@
+use std::collections::HashMap;
+
+#[derive(PartialEq, Eq, Hash, Clone, Copy)]
+pub(crate) struct Coordinate {
+    x: usize,
+    y: usize,
+}
+
+#[derive(Clone, Eq, PartialEq, Hash)]
+struct Symbol {
+    character: char,
+    position: Coordinate,
+}
+
+struct EnginePart {
+    number: u32,
+    start: Coordinate,
+    end: Coordinate,
+}
+
+impl EnginePart {
+    fn neighbors(&self) -> Vec<Coordinate> {
+        let mut neighbors: Vec<Coordinate> = Vec::new();
+
+        let y = self.start.y;
+        for x in self.start.x..self.end.x + 1 {
+            // left
+            if x > 0 && x == self.start.x {
+                neighbors.push(Coordinate { x: x - 1, y });
+                neighbors.push(Coordinate { x: x - 1, y: y + 1 });
+                if y > 0 {
+                    neighbors.push(Coordinate { x: x - 1, y: y - 1 });
+                }
+            }
+            // right
+            if x == self.end.x {
+                neighbors.push(Coordinate { x: x + 1, y });
+                neighbors.push(Coordinate { x: x + 1, y: y + 1 });
+                if y > 0 {
+                    neighbors.push(Coordinate { x: x + 1, y: y - 1 });
+                }
+            }
+            //top
+            if y > 0 {
+                neighbors.push(Coordinate { x, y: y - 1 });
+            }
+            //bottom
+            neighbors.push(Coordinate { x, y: y + 1 });
+        }
+
+        neighbors
+    }
+
+    pub fn neighboring_symbol(&self, symbols: &HashMap<Coordinate, Symbol>) -> Option<Symbol> {
+        for neighbor in self.neighbors() {
+            if let Some(symbol) = symbols.get(&neighbor) {
+                return Some(symbol.clone());
+            }
+        }
+        None
+    }
+}
+
diff --git a/2023-rust/src/input/mod.rs b/2023-rust/src/input/mod.rs
@@ -0,0 +1 @@
+pub mod input_03;
diff --git a/2023-rust/src/lib.rs b/2023-rust/src/lib.rs
@@ -1,4 +1,5 @@
 mod day;
+pub mod input;
 pub mod template;
 
 pub use day::*;