diff --git a/src/2018/day06.lisp b/src/2018/day06.lisp index 5ea9bf3..75f4921 100644 --- a/src/2018/day06.lisp +++ b/src/2018/day06.lisp @@ -19,6 +19,9 @@ (defvar input-data '()) (setf input-data (map 'list #'parse-line (test-input 2018 6))) +(defvar input-data '()) +(setf input-data (map 'list #'parse-line (test-input 2018 6))) + (defstruct vector-2d (x 0 :type fixnum) (y 0 :type fixnum)) @@ -34,6 +37,7 @@ (abs (vector-2d-x diff)) (abs (vector-2d-y diff))))) + (defvar sample-data '((1 1) (1 6) (8 3) @@ -41,8 +45,6 @@ (5 5) (8 9))) - - (defun make-vectors (data) (map 'list (lambda (p) (make-vector-2d :x (first p) :y (second p))) data)) diff --git a/test/2018/day06-test.lisp b/test/2018/day06-test.lisp index f43b145..fa52535 100644 --- a/test/2018/day06-test.lisp +++ b/test/2018/day06-test.lisp @@ -1,9 +1,10 @@ -(defpackage :aoc/2018/06/tests - (:use :cl :aoc :aoc/2018/06 :parachute)) +(defpackage :aoc/2018/06 + (:use :cl :aoc :aoc/tests :parachute)) (in-package :aoc/2018/06/tests) -(define-test suite-2018-06) +(define-test suite-2018-06 + :parent suite-2018) (define-test+run find-top-left :parent suite-2018-06 diff --git a/tests/main.lisp b/tests/main.lisp index 58979b1..c4b3a60 100644 --- a/tests/main.lisp +++ b/tests/main.lisp @@ -1,5 +1,6 @@ (defpackage aoc/tests - (:use :cl :aoc :parachute)) + (:use :cl :aoc :parachute + :aoc/2018/06 )) (in-package :aoc/tests)