testdekning d1 og d2

Author: Oddsor

input/2024/input3.nippy

@@ -1,4 +1,5 @@
-^{:nextjournal.clerk/visibility {:code :hide :result :hide}}
+^{:nextjournal.clerk/visibility {:code :hide :result :hide}
+  :kindly/hide-code true}
 (ns y2024.d01
   (:require
    [nextjournal.clerk :as clerk]
@@ -29,7 +30,8 @@
 
 ^{:nextjournal.clerk/visibility {:result :hide}}
 (require '[debux.core :as d])
-^{:nextjournal.clerk/visibility {:result :hide}}
+^{:nextjournal.clerk/visibility {:result :hide}
+  :kind/hidden true}
 (d/set-debug-mode! false)
 
 ; Så kan vi starte med å få tak i listene:
@@ -44,6 +46,17 @@
         (apply mapv vector))
    :level 2))
 
+(defmacro dbg-output [& body]
+  `(let [set-debug-mode!# (requiring-resolve 'debux.core/set-debug-mode!)]
+     (set-debug-mode!# true)
+     (let [debug-output#
+           (with-out-str ~@body)]
+       (set-debug-mode!# false)
+
+       ^:kind/hiccup [:pre debug-output#])))
+
+(dbg-output (get-lists test-data))
+
 ; dbg-makroen lar oss inspisere hva som skjer i hvert steg
 ; av get-lists-funksjonen:
 ^{:nextjournal.clerk/visibility {:result :hide}}
@@ -57,7 +70,6 @@
       (d/set-debug-mode! false)
       debug-output)))
 
-
 ; Når vi har listene kan vi sortere og finne differansen
 ; mellom hvert siffer, og summere:
 
@@ -91,7 +103,7 @@
         (d/set-debug-mode! false)
         debug-output))))
 
-(= 2756096 (total-difference (input/get-input 2024 1)))
+(total-difference (input/get-input 2024 1))
 
 ; ## Del 2
 
@@ -119,4 +131,4 @@
         (d/set-debug-mode! false)
         debug-output))))
 
-(= 23117829 (total-similarity-score (input/get-input 2024 1)))
+(total-similarity-score (input/get-input 2024 1))

input/2024/input4.nippy

@@ -41,7 +41,7 @@
 
 (safe-lines test-data)
 
-(= 314 (safe-lines (to-matrix (input/get-input 2024 2))))
+(safe-lines (to-matrix (input/get-input 2024 2)))
 
 ; ## Del 2
 
@@ -79,4 +79,4 @@
 ; Brute-force-løsningen kjører heldigvis på beskjedne 11ms på
 ; inputten i dag, så vi slipper å optimalisere denne gangen
 
-(= 373 (safeish-lines (to-matrix (input/get-input 2024 2))))
+(safeish-lines (to-matrix (input/get-input 2024 2)))

notebooks/y2024/d01.clj

@@ -1,5 +1,7 @@
 ^{:nextjournal.clerk/visibility {:code :hide}}
-(ns y2024.d03)
+(ns y2024.d03
+  (:require
+   [advent-of-code-clj.input :as input]))
 
 ; # 2024, dag 3
 
@@ -92,9 +94,7 @@
 
 ; Fortsatt riktig på testdata, og nå blir det også riktig på inputten:
 
-^{:nextjournal.clerk/visibility {:result :hide}}
-(comment
-  (= 90669332 (process-operations (get-operations (slurp "input/2024/input3.txt")))))
+(= 90669332 (process-operations (get-operations (input/get-input 2024 3))))
 
 ; ## Del 2 igjen
 
@@ -123,6 +123,4 @@
 
 (prep-input "xmul(2,4)&mul[3,7]!^don't()_mul(5,5)+mul(32,64](mul(11,8)undo()?don't()mul(8,5))")
 
-^{:nextjournal.clerk/visibility {:result :hide}}
-(comment
-  (= 90669332 (parse-and-multiply (prep-input (slurp "input/2024/input3.txt")))))
+(= 90669332 (parse-and-multiply (prep-input (input/get-input 2024 3))))

notebooks/y2024/d02.clj

@@ -1,6 +1,14 @@
 (ns y2024.d04
   (:require [advent-of-code-clj.utils :as utils]
-            [clojure.core.matrix :as mx]))
+            [clojure.core.matrix :as mx]
+            [advent-of-code-clj.input :as input]))
+
+; # 2024, dag 4
+
+; ## Del 1
+
+; Vi skal finne ordet "XMAS" i en matrise, i alle retninger
+; (horisontalt, verticalt, diagonalt).
 
 (def test-data (utils/coord-map (utils/text->matrix "MMMSXXMASM
 MSAMXMSMSA
@@ -57,8 +65,7 @@ MXMXAXMASX")))
 
 (= 18 (part-1 test-data))
 
-(comment
-  (= 2547 (part-1 (utils/coord-map (utils/text->matrix (slurp "input/2024/input4.txt"))))))
+(delay (= 2547 (part-1 (utils/coord-map (utils/text->matrix (input/get-input 2024 4))))))
 
 (defn find-x-mas [coord-map [x y]]
   (let [diagonals [[[(dec x) (dec y)] [x y] [(inc x) (inc y)]]
@@ -77,8 +84,7 @@ MXMXAXMASX")))
 
 (= 9 (part-2 test-data))
 
-(comment
-  (= 1939 (part-2 (utils/coord-map (utils/text->matrix (slurp "input/2024/input4.txt"))))))
+(delay (= 1939 (part-2 (utils/coord-map (utils/text->matrix (input/get-input 2024 4))))))
 
 ; # Igjen, med matriser
 
@@ -135,5 +141,4 @@ MXMXAXMASX")
 
 (= 18 (part-1-matrix test-input))
 
-(comment
-  (= 2547 (part-1-matrix (slurp "input/2024/input4.txt"))))
+(delay (= 2547 (part-1-matrix (input/get-input 2024 4))))

notebooks/y2024/d03.clj

@@ -0,0 +1,13 @@
+(ns y2024.d01-test
+  (:require
+   [clojure.test :refer [deftest is]]
+   [y2024.d01 :as sut]
+   [advent-of-code-clj.input :as input]))
+
+(deftest part-1-test
+  (is (= 11 (sut/total-difference sut/test-data)))
+  (is (= 2756096 (sut/total-difference (input/get-input 2024 1)))))
+
+(deftest part-2-test
+  (is (= 31 (sut/total-similarity-score sut/test-data)))
+  (is (= 23117829 (sut/total-similarity-score (input/get-input 2024 1)))))

notebooks/y2024/d04.clj

@@ -0,0 +1,13 @@
+(ns y2024.d02-test
+  (:require
+   [advent-of-code-clj.input :as input]
+   [clojure.test :refer [deftest is]]
+   [y2024.d02 :as sut]))
+
+(deftest part-1-test
+  (is (= 2 (sut/safe-lines sut/test-data)))
+  (is (= 314 (sut/safe-lines (sut/to-matrix (input/get-input 2024 2))))))
+
+(deftest part-2-test
+  (is (= 4 (sut/safeish-lines sut/test-data)))
+  (is (= 373 (sut/safeish-lines (sut/to-matrix (input/get-input 2024 2))))))