Improved Day 9 Part 2

src/main.rs

@@ -1,5 +1,5 @@
 #![feature(test)]
-
+#![feature(const_mut_refs)]
 use std::collections::BinaryHeap;
 extern crate test;
 
@@ -8,35 +8,36 @@ const INPUTS: [&'static str; 2] = [
     include_str!("../inputs/input.txt"),
 ];
 
-fn parse_input(input: &'static str) -> Vec<Vec<u8>> {
+fn parse_input<const M: usize, const N: usize>(input: &'static str) -> [[u8; N]; M] {
-    input
+    let mut out = [[0; N]; M];
-        .lines()
+
-        .filter(|&x| !x.is_empty())
+    for (i, line) in input.lines().filter(|&x| !x.is_empty()).enumerate() {
-        .map(|line| line.bytes().map(|x| x - b'0').collect())
+        for (j, c) in line.bytes().map(|x| x - b'0').enumerate() {
-        .collect()
+            out[i][j] = c;
+        }
+    }
+
+    out
 }
 
 const NEIGHBOURS: [[i32; 2]; 4] = [[-1, 0], [1, 0], [0, -1], [0, 1]];
 
-fn solution(mut input: Vec<Vec<u8>>) -> u64 {
+fn solution<const M: usize, const N: usize>(mut input: [[u8; N]; M]) -> u64 {
-    let m = input.len() as i32;
-    let n = input[0].len() as i32;
-
     let mut heap = BinaryHeap::with_capacity(3);
 
-    for i in 0..m {
+    for i in 0..M {
-        for j in 0..n {
+        for j in 0..N {
             let mut is_minimum = true;
 
             for &neighbour in NEIGHBOURS.iter() {
-                let x = i + neighbour[0];
+                let x = i as i32 + neighbour[0];
-                let y = j + neighbour[1];
+                let y = j as i32 + neighbour[1];
 
-                if x < 0 || y < 0 || x >= m || y >= n {
+                if x < 0 || y < 0 || x >= M as i32 || y >= N as i32 {
                     continue;
                 }
 
-                if input[i as usize][j as usize] >= input[x as usize][y as usize] {
+                if input[i][j] >= input[x as usize][y as usize] {
                     is_minimum = false;
                     break;
                 }
@@ -55,45 +56,61 @@ fn solution(mut input: Vec<Vec<u8>>) -> u64 {
 
 const VISITED: u8 = 1 << 7;
 
-fn dfs(grid: &mut [Vec<u8>], px: i32, py: i32) -> u64 {
+#[inline]
-    if grid[px as usize][py as usize] == VISITED {
+const fn dfs<const M: usize, const N: usize>(grid: &mut [[u8; N]; M], px: usize, py: usize) -> u64 {
+    if grid[px][py] == VISITED {
         return 0;
     } else {
-        grid[px as usize][py as usize] = VISITED;
+        grid[px][py] = VISITED;
     }
 
     let mut ldepth = 0;
-    for neigh in NEIGHBOURS.iter() {
-        let x = px as i32 + neigh[0];
-        let y = py as i32 + neigh[1];
 
-        if x < 0
+    let mut x = px + 1;
-            || y < 0
+    let mut y = py;
-            || x >= grid.len() as i32
+    if is_valid_coord::<M, N>(x, y) && grid[x][y] < 9 && grid[x][y] != VISITED {
-            || y >= grid[0].len() as i32
+        ldepth += dfs(grid, x, y);
-            || grid[x as usize][y as usize] == 9
-            || grid[x as usize][y as usize] == VISITED
-        {
-            continue;
     }
 
+    x = px;
+    y = py + 1;
+    if is_valid_coord::<M, N>(x, y) && grid[x][y] < 9 && grid[x][y] != VISITED {
+        ldepth += dfs(grid, x, y);
+    }
+
+    x = px.wrapping_sub(1);
+    y = py;
+    if is_valid_coord::<M, N>(x, y) && grid[x][y] < 9 && grid[x][y] != VISITED {
+        ldepth += dfs(grid, x, y);
+    }
+
+    x = px;
+    y = py.wrapping_sub(1);
+    if is_valid_coord::<M, N>(x, y) && grid[x][y] < 9 && grid[x][y] != VISITED {
         ldepth += dfs(grid, x, y);
     }
 
     ldepth + 1
 }
 
+#[inline]
+const fn is_valid_coord<const M: usize, const N: usize>(x: usize, y: usize) -> bool {
+    !(x >= M || y >= N)
+}
+
 fn main() {
-    for input in INPUTS {
+    let input = parse_input::<5, 10>(INPUTS[0]);
-        let input = parse_input(input);
+    let result = solution::<5, 10>(input);
-        let result = solution(input);
+    println!("Result {}", result);
+
+    let input = parse_input::<100, 100>(INPUTS[1]);
+    let result = solution::<100, 100>(input);
     println!("Result {}", result);
-    }
 }
 
 #[bench]
 fn solution_bench(b: &mut test::Bencher) {
-    let input = parse_input(INPUTS[1]);
+    let input = parse_input::<100, 100>(INPUTS[1]);
     b.iter(|| {
         let result = solution(input.clone());
         test::black_box(result);