902b736dfedb
Refactor
| author | Steve Losh <steve@stevelosh.com> |
|---|---|
| date | Tue, 05 Dec 2017 20:54:59 -0500 |
| parents | b50f1ec26d64 |
| children | 5f1511ebec96 |
| branches/tags | (none) |
| files | src/main.lisp |
Changes
--- a/src/main.lisp Tue Dec 05 18:16:40 2017 -0500 +++ b/src/main.lisp Tue Dec 05 20:54:59 2017 -0500 @@ -25,15 +25,6 @@ (collect (str:words line)))) -(defun contains-duplicates-p (list &key (test #'eql)) - (iterate (for (head . tail) :on list) - (thereis (member head tail :test test)))) - -(defun anagramp (string1 string2) - (string= (sort (copy-seq string1) #'char<) - (sort (copy-seq string2) #'char<))) - - ;;;; Problems ----------------------------------------------------------------- (defun day-1/1 () (iterate (for (x . y) :pairs-of-list (read-file-of-digits "data/2017/01")) @@ -96,20 +87,23 @@ (setf (gethash coord memory) value)))) -(defun d4-valid-passphrase-p (phrase) - (not (contains-duplicates-p phrase :test #'string=))) - (defun day-4/1 () - (count-if #'d4-valid-passphrase-p - (read-file-of-lines-of-words "data/2017/04"))) + (labels ((contains-duplicates-p (list &key (test #'eql)) + (iterate (for (head . tail) :on list) + (thereis (member head tail :test test)))) + (validp (phrase) + (not (contains-duplicates-p phrase :test #'string=)))) + (count-if #'validp (read-file-of-lines-of-words "data/2017/04")))) (defun day-4/2 () - (flet ((contains-anagram-p (phrase) - (iterate (for (word . tail) :on phrase) - (thereis (find-if (curry #'anagramp word) tail))))) - (-<> (read-file-of-lines-of-words "data/2017/04") - (remove-if-not #'d4-valid-passphrase-p <>) - (count-if-not #'contains-anagram-p <>)))) + (labels ((anagramp (string1 string2) + (string= (sort (copy-seq string1) #'char<) + (sort (copy-seq string2) #'char<))) + (contains-anagram-p (phrase) + (iterate (for (word . tail) :on phrase) + (thereis (find-if (curry #'anagramp word) tail))))) + (count-if-not #'contains-anagram-p + (read-file-of-lines-of-words "data/2017/04")))) (defun day-5/1 ()