improve day01

1 files changed, 17 insertions, 26 deletions

diff --git a/2023/day01.rs b/2023/day01.rs
index 3a3bfb2..7db1307 100644
--- a/2023/day01.rs
+++ b/2023/day01.rs
@@ -5,8 +5,8 @@ use std::fs::File;
 use std::io::Read;
 
 fn main() {
-    let filename = "in/day01.ref";
-    // let filename = "in/day01.pzl";
+    // let filename = "in/day01.ref";
+    let filename = "in/day01.pzl";
 
     let mut f = File::open(filename).expect("cannot open file");
     let mut content = String::new();
@@ -15,41 +15,32 @@ fn main() {
     // println!("{:?}", lines);
 
     let mut res1 = 0;
-    for line in &lines {
-        let nums: Vec<_> = line.chars().filter_map(|a| a.to_digit(10)).collect();
-        if nums.len() == 1 {
-            res1 += nums[0] * 10 + nums[0];
-        } else {
-            res1 += nums[0] * 10 + nums[nums.len() - 1];
-        }
-    }
-
     let mut res2 = 0;
+
     let digits = [
         "zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine",
     ];
+
     for line in &lines {
-        let b: Vec<char> = line.chars().collect();
-        let mut nums: Vec<u32> = Vec::new();
-        for i in 0..b.len() {
-            match b[i].to_digit(10) {
-                Some(i) => nums.push(i),
-                None => (),
+        let mut nums1: Vec<u32> = Vec::new();
+        let mut nums2: Vec<u32> = Vec::new();
+        for (i, c) in line.chars().enumerate() {
+            if let Some(n) = c.to_digit(10) {
+                nums1.push(n);
+                nums2.push(n);
             }
-            for (j, digit) in digits.iter().enumerate() {
-                let d: Vec<char> = digit.chars().collect();
-                if d.iter().zip(b[i..].iter()).filter(|&(a, b)| a == b).count() == d.len() {
-                    nums.push(j as u32);
+            for (d, d_str) in digits.iter().enumerate() {
+                if line[i..].starts_with(d_str) {
+                    nums2.push(d as u32);
                 }
             }
         }
-        if nums.len() == 0 {
-            res2 += nums[0] * 10 + nums[0];
-        } else {
-            res2 += nums[0] * 10 + nums[nums.len() - 1];
-        }
+        res1 += nums1[0] * 10 + nums1[nums1.len() - 1];
+        res2 += nums2[0] * 10 + nums2[nums2.len() - 1];
     }
 
     println!("res1: {}", res1);
     println!("res2: {}", res2);
+    assert_eq!(res1, 55538);
+    assert_eq!(res2, 54875);
 }