matrix utils

notebooks/y2024/d25.clj

@@ -1,7 +1,7 @@
 (ns y2024.d25
   (:require
    [advent-of-code-clj.input :as input]
-   [advent-of-code-clj.utils :as utils]))
+   [advent-of-code-clj.matrix :as mx]))
 
 (def test-input "#####
 .####
@@ -54,11 +54,11 @@
 (defn parse-key [input]
   (map (fn [line]
          (dec (count (filter #{\.} line))))
-       (apply mapv vector (utils/text->matrix input))))
+       (mx/transpose (mx/text->matrix input))))
 (defn parse-lock [input]
   (map (fn [line]
          (dec (count (filter #{\#} line))))
-       (apply mapv vector (utils/text->matrix input))))
+       (mx/transpose (mx/text->matrix input))))
 
 (defn parse [input]
   (let [lock-or-key (.split input "\n\n")

src/advent_of_code_clj/matrix.clj

@@ -0,0 +1,19 @@
+(ns advent-of-code-clj.matrix)
+
+(defn transpose [xs-of-xses]
+  (apply mapv vector xs-of-xses))
+
+(defn coord-map-fixed
+  {:malli/schema [:-> [:sequential [:sequential :any]] [:map-of [:tuple :int :int] :any]]}
+  [xs-of-xses]
+  (->> xs-of-xses
+       (map-indexed (fn [idy xs]
+                      (map-indexed (fn [idx v]
+                                     [[idy idx] v])
+                                   xs)))
+       (transduce cat merge)))
+
+(defn text->matrix
+  {:malli/schema [:-> :string [:vector [:vector char?]]]}
+  [text]
+  (mapv vec (.split text "\n")))

src/advent_of_code_clj/utils.clj

@@ -1,5 +1,7 @@
 (ns advent-of-code-clj.utils
-  (:import [java.util HashSet]))
+  (:import [java.util HashSet])
+  (:require
+   [advent-of-code-clj.matrix :as mx]))
 
 (defn coord-map
   {:malli/schema [:-> [:sequential [:sequential :any]] [:map-of [:tuple :int :int] :any]]}
@@ -11,20 +13,9 @@
                                    xs)))
        (transduce cat merge)))
 
-(defn coord-map-fixed
-  {:malli/schema [:-> [:sequential [:sequential :any]] [:map-of [:tuple :int :int] :any]]}
-  [xs-of-xses]
-  (->> xs-of-xses
-       (map-indexed (fn [idy xs]
-                      (map-indexed (fn [idx v]
-                                     [[idy idx] v])
-                                   xs)))
-       (transduce cat merge)))
+(def coord-map-fixed mx/coord-map-fixed)
 
-(defn text->matrix
-  {:malli/schema [:-> :string [:vector [:vector char?]]]}
-  [text]
-  (mapv vec (.split text "\n")))
+(def text->matrix mx/text->matrix)
 
 (defn adjacent-hv
   "Find adjacent coordinates, without diagonals"