Move to use Aoc.Grid

bin/day2408.ml

@@ -1,29 +1,13 @@
-type map = { map : string; width : int; height : int }
-
-let map_of_file fname =
-  let strs = Aoc.strings_of_file fname in
-  let width = String.length (List.hd strs) in
-  let map = List.fold_left ( ^ ) "" strs in
-  let height = String.length map / width in
-  { map; width; height }
-
-let map_length map = String.length map.map
-let map_get_by_idx map idx = map.map.[idx]
-let map_pos_of_idx map idx = (idx mod map.width, idx / map.width)
-
-let map_is_valid_pos map (x, y) =
-  x >= 0 && x < map.width && y >= 0 && y < map.height
-
 module CharMap = Map.Make (Char)
 
 (** [get_station_indices map] returns a list of pairs mapping station ID to the
     indices in [map] where there is a station with that ID. *)
 let get_station_indices map =
   let rec impl acc idx =
-    if idx >= map_length map then acc
-    else if map_get_by_idx map idx = '.' then impl acc (idx + 1)
+    if idx >= Aoc.Grid.length map then acc
+    else if Aoc.Grid.get_by_idx map idx = '.' then impl acc (idx + 1)
     else
-      let station = map_get_by_idx map idx in
+      let station = Aoc.Grid.get_by_idx map idx in
       let update_fn lst =
         match lst with None -> Some [ idx ] | Some t -> Some (idx :: t)
       in
@@ -40,7 +24,7 @@ let get_antinodes1 acc _ (px, py) (px', py') =
 (** [add_antinodes lst map pos vel] adds antinodes at [pos + n * vel] to [lst]
     for all non-negative [n] that are valid positions in [map]. *)
 let rec add_antinodes lst map (x, y) (dx, dy) =
-  if map_is_valid_pos map (x, y) then
+  if Aoc.Grid.pos_is_valid map (x, y) then
     add_antinodes ((x, y) :: lst) map (x + dx, y + dy) (dx, dy)
   else lst
 
@@ -60,11 +44,11 @@ let process_stations map fn stations =
   let rec impl2 acc p t =
     match t with
     | [] -> acc
-    | h :: t -> impl2 (fn acc map p (map_pos_of_idx map h)) p t
+    | h :: t -> impl2 (fn acc map p (Aoc.Grid.pos_of_idx map h)) p t
   in
   let rec impl acc = function
     | [] -> acc
-    | h :: t -> impl (impl2 acc (map_pos_of_idx map h) t) t
+    | h :: t -> impl (impl2 acc (Aoc.Grid.pos_of_idx map h) t) t
   in
   List.map (impl []) stations
 
@@ -77,12 +61,12 @@ let part antifn map =
   |> List.map snd (* we do not care about the station IDs *)
   |> process_stations map antifn
   |> List.concat
-  |> List.filter (map_is_valid_pos map)
+  |> List.filter (Aoc.Grid.pos_is_valid map)
   |> List.sort_uniq Stdlib.compare
   |> List.length
 
 let _ =
-  Aoc.main map_of_file
+  Aoc.main Aoc.Grid.of_file
     [
       (string_of_int, part get_antinodes1); (string_of_int, part get_antinodes2);
     ]