Refactor helper methods to the Grid struct impl.

Author: ozten

day_12_hill_climbing_algorithm/src/grid.rs

@@ -41,77 +41,71 @@ pub struct Grid {
     pub goal: Point,
 }
 
-fn get_as_usize(grid: &Grid, point: &Point) -> Space {
-    grid.spaces
-        .get(grid.width * point.y + point.x)
-        .unwrap()
-        .to_owned()
-}
+impl Grid {
+    fn idx(&self, point: &Point) -> usize {
+        self.width * point.y + point.x
+    }
 
-fn get_as_usize_offset_row(grid: &Grid, point: &Point, y: isize) -> Space {
-    let new_y = point.y as isize + y;
-    grid.spaces
-        .get(grid.width * (new_y as usize) + point.x)
-        .unwrap()
-        .to_owned()
-}
+    fn get_by_row(&self, point: &Point, y: isize) -> &Space {
+        let new_y = point.y as isize + y;
+        self.spaces
+            .get(self.width * (new_y as usize) + point.x)
+            .unwrap()
+    }
 
-fn get_as_usize_offset_col(grid: &Grid, point: &Point, x: isize) -> Space {
-    let new_x = point.x as isize + x;
-    grid.spaces
-        .get(grid.width * point.y + new_x as usize)
-        .unwrap()
-        .to_owned()
-}
+    fn get_by_col(&self, point: &Point, x: isize) -> &Space {
+        let new_x = point.x as isize + x;
+        self.spaces
+            .get(self.width * point.y + new_x as usize)
+            .unwrap()
+    }
 
-impl Grid {
-    
-pub fn valid_neighbors(&self, point: &Point) -> Vec<(Point, usize)> {
-    let mut valid = Vec::new();
-    let cur = get_as_usize(self, point);
-    // up
-    if point.y >= 1 {
-        let up = get_as_usize_offset_row(self, point, -1);
-        if cur.can_move(&up) {
-            valid.push(Point {
-                x: point.x,
-                y: point.y - 1,
-            });
+    pub fn valid_neighbors(&self, point: &Point) -> Vec<(Point, usize)> {
+        let mut valid = Vec::new();
+        let cur = self.spaces.get(self.idx(point)).unwrap();
+        // up
+        if point.y >= 1 {
+            let up = self.get_by_row(point, -1);
+            if cur.can_move(&up) {
+                valid.push(Point {
+                    x: point.x,
+                    y: point.y - 1,
+                });
+            }
         }
-    }
 
-    // right
-    if point.x + 1 < self.width {
-        let right = get_as_usize_offset_col(self, point, 1);
-        if cur.can_move(&right) {
-            valid.push(Point {
-                x: point.x + 1,
-                y: point.y,
-            });
+        // right
+        if point.x + 1 < self.width {
+            let right = self.get_by_col(point, 1);
+            if cur.can_move(&right) {
+                valid.push(Point {
+                    x: point.x + 1,
+                    y: point.y,
+                });
+            }
         }
-    }
 
-    // down
-    if point.y + 1 < self.height {
-        let down = get_as_usize_offset_row(self, point, 1);
-        if cur.can_move( &down) {
-            valid.push(Point {
-                x: point.x,
-                y: point.y + 1,
-            });
+        // down
+        if point.y + 1 < self.height {
+            let down = self.get_by_row(point, 1);
+            if cur.can_move(&down) {
+                valid.push(Point {
+                    x: point.x,
+                    y: point.y + 1,
+                });
+            }
         }
-    }
 
-    // left
-    if point.x >= 1 {
-        let left = get_as_usize_offset_col(self, point, -1);
-        if cur.can_move( &left) {
-            valid.push(Point {
-                x: point.x - 1,
-                y: point.y,
-            });
+        // left
+        if point.x >= 1 {
+            let left = self.get_by_col(point, -1);
+            if cur.can_move(&left) {
+                valid.push(Point {
+                    x: point.x - 1,
+                    y: point.y,
+                });
+            }
         }
+        valid.into_iter().map(|p| (p, 1)).collect()
     }
-    valid.into_iter().map(|p| (p, 1)).collect()
-}
 }

day_12_hill_climbing_algorithm/src/main.rs

@@ -3,7 +3,7 @@ use std::{fs::read_to_string, io::Error};
 use pathfinding::dijkstra;
 
 mod grid;
-use grid::{Grid, Space};
+use grid::Space;
 
 mod parser;
 use parser::parse;