solve day 11

2023/day11/src/lib.rs

@@ -1,3 +1,6 @@
+mod faster;
+mod p1slow;
+
 use std::fmt::Debug;
 
 use helper::{Day, IteratorExt, Variants};
@@ -11,10 +14,11 @@ struct Day11;
 helper::define_variants! {
     day => crate::Day11;
     part1 {
-        basic => crate::part1;
+        basic => crate::p1slow::part1;
+        faster => crate::faster::part1, sample_count=200;
     }
     part2 {
-        basic => crate::part2;
+        basic => crate::faster::part2, sample_count=200;
     }
 }
 
@@ -54,78 +58,15 @@ fn parse(input: &str) -> Universe {
     }
 }
 
-fn expand(universe: Universe) -> Universe {
-    let mut rows = universe
-        .rows
-        .into_iter()
-        .flat_map(|row| {
-            if row.iter().all(|b| !b) {
-                vec![row.clone(), row]
-            } else {
-                vec![row]
-            }
-        })
-        .collect_vec();
-
-    let mut col = 0;
-    while col < rows[0].len() {
-        if rows.iter().all(|row| !row[col]) {
-            rows.iter_mut().for_each(|row| row.insert(col, false));
-            col += 1;
-        }
-        col += 1;
-    }
-
-    Universe { rows }
-}
-
-fn part1(input: &str) -> u64 {
-    let universe = parse(input);
-    let universe = expand(universe);
-
-    let galaxies = universe
-        .rows
-        .iter()
-        .enumerate()
-        .flat_map(|(i, row)| {
-            row.iter()
-                .copied()
-                .enumerate()
-                .filter(|&(_, b)| b)
-                .map(move |(j, _)| (i, j))
-        })
-        .collect_vec();
-
-    let mut sum = 0;
-
-    for i in 0..galaxies.len() {
-        for j in (i + 1)..galaxies.len() {
-            let lhs = galaxies[i];
-            let rhs = galaxies[j];
-
-            let distance_x = ((lhs.1 as i64) - (rhs.1 as i64)).abs();
-            let distance_y = ((lhs.0 as i64) - (rhs.0 as i64)).abs();
-
-            sum += distance_x + distance_y;
-        }
-    }
-
-    sum as u64
-}
-
-fn part2(_input: &str) -> u64 {
-    0
-}
-
 helper::tests! {
     day11 Day11;
     part1 {
         small => 374;
-        default => 0;
+        default => 9370588;
     }
     part2 {
-        small => 0;
-        default => 0;
+        small => 82000210;
+        default => 746207878188;
     }
 }
 helper::benchmarks! {}