Day3 part1 solution with passing tests (but failing solution)

day3/src/part1.rs

@@ -1,55 +1,110 @@
-use regex::Regex;
+use regex::{Match, Regex};
+use std::{fmt::Display, num::ParseIntError};
 
-pub fn main(input: &str) -> i32 {
+#[derive(Debug)]
-    todo!();
+struct Symbol {
+    value: char,
+    row: usize,
+    col: usize,
+}
+
+impl Display for Symbol {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}: ({},{})", self.value, self.row + 1, self.col + 1)
+    }
 }
 
 #[derive(Debug)]
-enum Engine {
+struct Number {
-    Number {
     value: u32,
-        line: usize,
+    row: usize,
     start: usize,
     end: usize,
-    },
-    Symbol {
-        value: char,
-        line: usize,
-        pos: usize,
-    },
 }
 
-fn get_numbers(index: usize, line: &str) -> Vec<Engine> {
+impl Display for Number {
-    Regex::new(r"\d+")
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        .unwrap()
+        write!(
-        .find_iter(line)
+            f,
-        .filter_map(|m| match m.as_str().parse() {
+            "{0}: ({1},{2}) -> ({1},{3})",
-            Ok(value) => Some(Engine::Number {
+            self.value,
-                value,
+            self.row + 1,
-                line: index,
+            self.start + 1,
-                start: m.start(),
+            self.end + 1,
-                end: m.end(),
+        )
-            }),
+    }
-            _ => None,
-        })
-        .collect()
 }
 
-fn get_symbols(index: usize, line: &str) -> Vec<Engine> {
+impl Number {
-    line.chars()
+    fn valid(&self, symbols: &[Symbol]) -> bool {
-        .enumerate()
+        let adjacent: Vec<usize> = symbols
-        .filter_map(|(j, m)| {
+            .iter()
-            if !m.is_ascii_digit() && m != '.' {
+            .filter_map(|m| {
-                Some(Engine::Symbol {
+                let start = if self.row > 1 { self.row - 1 } else { 1 };
-                    value: m,
+                let end = self.row + 1;
-                    line: index,
+                if (start..=end).contains(&m.row) {
-                    pos: j,
+                    Some(m.col)
-                })
                 } else {
                     None
                 }
             })
-        .collect()
+            .collect();
+        let start = if self.start > 1 { self.start - 1 } else { 1 };
+        let end = self.end + 1;
+        (start..=end).any(|m| adjacent.contains(&m))
+    }
+}
+
+impl TryFrom<Match<'_>> for Number {
+    type Error = ParseIntError;
+
+    fn try_from(value: Match) -> Result<Self, Self::Error> {
+        Ok(Self {
+            value: value.as_str().parse()?,
+            row: 0,
+            start: value.start(),
+            end: value.end(),
+        })
+    }
+}
+
+fn get_symbols(input: &str) -> Vec<Symbol> {
+    let mut items: Vec<Symbol> = Vec::new();
+    for (row, line) in input.lines().enumerate() {
+        for (col, value) in line.chars().enumerate() {
+            if !value.is_ascii_digit() && value != '.' {
+                items.push(Symbol { value, row, col })
+            }
+        }
+    }
+    items
+}
+
+fn get_numbers(input: &str) -> Vec<Number> {
+    let rstring = r"(\d)+";
+    let mut items: Vec<Number> = Vec::new();
+    for (row, line) in input.lines().enumerate() {
+        for item in Regex::new(rstring).unwrap().find_iter(line) {
+            let mut number = Number::try_from(item).unwrap();
+            number.row = row;
+            items.push(number);
+        }
+    }
+    items
+}
+
+pub fn main(input: &str) -> u32 {
+    let symbols = get_symbols(input);
+    get_numbers(input)
+        .iter()
+        .filter_map(|m| {
+            if m.valid(&symbols) {
+                Some(m.value)
+            } else {
+                None
+            }
+        })
+        .sum()
 }
 
 #[cfg(test)]