aoc.asd

@@ -52,7 +52,6 @@
 		 (:file "2024/day20")
 		 (:file "2024/day21")
 		 (:file "2024/day22")
-				  (:file "2024/day23")
 		 )))
   :description "Advent of Code challenges and solutions."
   :long-description "Solutions for the AOC challenges."
@@ -91,7 +90,6 @@
 		 (:file "2024/day20-test")
 		 (:file "2024/day21-test")
 		 (:file "2024/day22-test")
-				  (:file "2024/day23-test")
 		 )))
   :description "Test system for aoc"
   :perform (test-op (op c) (symbol-call :parachute :test :aoc/tests)))

src/2024/day21.lisp

@@ -262,11 +262,6 @@
     sum (let ((ll (gethash (list layer ki kf) leg-lengths)))
 	  ll)))
 
-(defun press-move (d pc mc)
-  (loop
-    for i from 1 to (abs d)
-    collect (if (plusp d) pc mc)))
-
 (defun fill-leg-table (n-robots)
   (setf leg-lengths (make-hash-table :test #'equal))
   
@@ -303,15 +298,19 @@
 		do (let* (
 			  (dx (- xf xi))
 			  (dy (- yf yi))
-			  (hp (press-move dx #\> #\<))
+			  (hp  (loop
-			  (vp (press-move dy #\v #\^))
+				 for x from 0 below (abs dx)
+				 collect (if (plusp dx) #\> #\<)))
+			  (vp  (loop
+				 for y from 0 below (abs dy)
+				 collect (if (minusp dy) #\^ #\v)))
 			  (hf (coerce (append hp vp '(#\A)) 'string))
 			  (h-first (if (equal (cons xf yi) space-pos)
-				       99999999999
+				       999
 				       (fewest-presses (1- layer) hf)))
 			  (vf (coerce (append vp hp '(#\A)) 'string))
 			  (v-first (if (equal (cons xi yf) space-pos)
-				       99999999999
+				       999
 				       (fewest-presses (1- layer) vf))))
 		     ;;(format t "h ~A ~A ~A ~A~%" xi yf hf h-first)
 		     ;;(format t "v ~A ~A ~A ~A~%" xf yi vf v-first)
@@ -323,13 +322,6 @@
 	 ))
   )
 
-
-(defun print-leg-lengths (stream)
-  (loop
-    for k being the hash-keys in leg-lengths
-    for v being the hash-values in leg-lengths
-    do (format stream "~2,'0D,~A,~A,~A~%" (first k) (second k) (third k) v)))
-
 (defun complexity (code n)
   (let ((l (fewest-presses n code))
 	(v (parse-integer (ppcre:scan-to-strings "\\d+" code))))
@@ -347,15 +339,6 @@
 	 do (format t "~15A~%" (fewest-presses n code))
 	 )))
 
-(defun write-leg-lengths-to-file (filename)
-  (with-open-file (str filename
-		       :direction :output
-		       :if-exists :supersede
-		       :if-does-not-exist :create)
-    (print-leg-lengths str)))
-
-
-
 
 (defun part1 (data)
   (fill-leg-table 3)

src/2024/day24.lisp

@@ -1,42 +0,0 @@
-
-(defpackage :aoc/2024/24
-  (:use :cl :aoc :alexandria :trivia :lla)
-  (:export
-   #:sample-data
-   #:sample-data2
-   #:part1
-   #:part2
-   ))
-
-(in-package :aoc/2024/24)
-
-
-(defun parse-line (line)
-  line)
-
-
-(defun parse-input (lines)
-  (mapcar #'parse-line lines))
-
-(defparameter input-text (test-input 2024 24))
-(defparameter input-data (parse-input input-text))
-
-(defparameter sample-text (aoc:split-lines ""))
-(defparameter sample-data 
-              (parse-input sample-text))
-
-(defun part1 (data)
-  (length data))
-
-(defun part2 (data)
-  (length data))
-
-(defun solve-day ()
-  (format t "part1: ~A~%" (part1 input-data))
-  (format t "part2: ~A~%" (part2 input-data)))
-
-(defun submit ()
-  (let ((p1 (part1 input-data))
-        (p2 (part2 input-data)))
-    (if p1 (submit-part1 2024 24 p1))
-    (if p2 (submit-part2 2024 24 p2))))

tests/2024/day24-test.lisp

@@ -1,27 +0,0 @@
-(defpackage :aoc/2024/24/tests
-            (:use :cl :aoc :aoc/tests :aoc/2024/tests :parachute :aoc/2024/24))
-
-(in-package :aoc/2024/24/tests)
-
-(define-test suite-2024-24
-                                        ;:parent suite-2024
-             )
-
-(define-test test-foo
-             :parent suite-2024-24
-             ) 
-
-
-(define-test test-bar
-             :parent suite-2024-24
-             )
-
-
-
-(define-test+run test-part1
-                 :parent suite-2024-24
-                 (is equal nil (part1 sample-data)))
-
-(define-test+run test-part2
-                 :parent suite-2024-24
-                 (is equal nil (part2 sample-data)))