diff options
| author | Clyne Sullivan <clyne@bitgloo.com> | 2021-12-02 14:39:09 -0500 |
|---|---|---|
| committer | Clyne Sullivan <clyne@bitgloo.com> | 2021-12-02 14:39:09 -0500 |
| commit | 5ebea9566f625901f7736a8cdb24f858853c6434 (patch) | |
| tree | 07bc8561e277fc18c0a1c600316efe2be7a20a85 /day2 | |
| parent | cc70fd90f3605f38313c47d865d992bfc3064c19 (diff) | |
day2: cleaner approach
Diffstat (limited to 'day2')
| -rw-r--r-- | day2/part1.clj | 14 | ||||
| -rw-r--r-- | day2/part2.clj | 22 |
2 files changed, 14 insertions, 22 deletions
diff --git a/day2/part1.clj b/day2/part1.clj index 1a4df6b..6b09212 100644 --- a/day2/part1.clj +++ b/day2/part1.clj @@ -8,22 +8,18 @@ (require '[clojure.string :as str]) -(loop [xpos 0 depth 0] +(loop [data {:xpos 0 :depth 0}] (let [input (read-line)] (if (empty? input) - (println (* xpos depth)) + (println (apply * (vals data))) (let [ins (str/split input #" ") n (Integer/parseInt (second ins)) ] (recur - (if (= (first ins) "forward") - (+ xpos n) - xpos - ) (case (first ins) - "up" (- depth n) - "down" (+ depth n) - depth + "forward" (update-in data [:xpos] + n) + "up" (update-in data [:depth] - n) + "down" (update-in data [:depth] + n) ) ) ) diff --git a/day2/part2.clj b/day2/part2.clj index 35fe3fb..7eeeb21 100644 --- a/day2/part2.clj +++ b/day2/part2.clj @@ -8,26 +8,22 @@ (require '[clojure.string :as str]) -(loop [xpos 0 depth 0 aim 0] +(loop [data {:xpos 0 :depth 0 :aim 0}] (let [input (read-line)] (if (empty? input) - (println (* xpos depth)) + (println (apply * (map data [:xpos :depth]))) (let [ins (str/split input #" ") n (Integer/parseInt (second ins)) ] (recur - (if (= (first ins) "forward") - (+ xpos n) - xpos - ) - (if (= (first ins) "forward") - (+ depth (* aim n)) - depth - ) (case (first ins) - "down" (+ aim n) - "up" (- aim n) - aim) + "forward" (-> data + (update-in [:xpos] + n) + (update-in [:depth] + (* (data :aim) n)) + ) + "up" (update-in data [:aim] - n) + "down" (update-in data [:aim] + n) + ) ) ) ) |