Change some defs to let bindings
This commit is contained in:
parent
bcc22ab414
commit
5adb6a2b0a
|
@ -6,16 +6,20 @@
|
||||||
(get [3 6 0] (mod (- our-move their-move) 3)))
|
(get [3 6 0] (mod (- our-move their-move) 3)))
|
||||||
(defn part-1-round-score
|
(defn part-1-round-score
|
||||||
[move-pair]
|
[move-pair]
|
||||||
(let [[opposing-move our-move] move-pair]
|
(let [
|
||||||
(def op (get move-map opposing-move))
|
[opposing-move our-move] move-pair
|
||||||
(def us (get move-map our-move))
|
op (get move-map opposing-move)
|
||||||
|
us (get move-map our-move)
|
||||||
|
]
|
||||||
(+ (draw-win-lose-score us op) us)))
|
(+ (draw-win-lose-score us op) us)))
|
||||||
(println (reduce + (map part-1-round-score move-pairs))) ; Part 1
|
(println (reduce + (map part-1-round-score move-pairs))) ; Part 1
|
||||||
(defn part-2-round-score
|
(defn part-2-round-score
|
||||||
[move-pair]
|
[move-pair]
|
||||||
(let [[opposing-move our-move] move-pair]
|
(let [
|
||||||
(def op (get move-map opposing-move))
|
[opposing-move our-move] move-pair
|
||||||
(def us-move-offset (- (get move-map our-move) 2))
|
op (get move-map opposing-move)
|
||||||
(def us (+ (mod (+ (- op 1) us-move-offset) 3) 1))
|
us-move-offset (- (get move-map our-move) 2)
|
||||||
|
us (+ (mod (+ (- op 1) us-move-offset) 3) 1)
|
||||||
|
]
|
||||||
(+ (draw-win-lose-score us op) us)))
|
(+ (draw-win-lose-score us op) us)))
|
||||||
(println (reduce + (map part-2-round-score move-pairs))) ; Part 2
|
(println (reduce + (map part-2-round-score move-pairs))) ; Part 2
|
||||||
|
|
Loading…
Reference in New Issue