day17: optimized part 1, merge into partboth.clj

2 files changed, 8 insertions, 49 deletions

diff --git a/day17/part1.clj b/day17/part1.clj
deleted file mode 100644
index 220e408..0000000
--- a/day17/part1.clj
+++ /dev/null
@@ -1,34 +0,0 @@
-(def target-area [[169 -8] [206 -108]])
-;(def target-area [[20 -5] [30 -10]])
-(def initial-pos [0 0])
-
-(defn beyond-target? [[[tbx tby] [tex tey]] [x y]]
-  (or (> x tex) (< y tey)))
-
-(defn within-target? [[[tbx tby] [tex tey]] [x y]]
-  (and (>= x tbx) (<= x tex) (<= y tby) (>= y tey)))
-
-(defn apply-velocity [[pos vel]]
-  [[(+ (first pos) (first vel)) (+ (second pos) (second vel))]
-   [(cond-> (first vel) (> (first vel) 0) dec (< (first vel) 0) inc) (dec (second vel))]])
-
-(defn path-builder [vel] (iterate apply-velocity [initial-pos vel]))
-
-(defn build-path [target vel]
-  (map first
-    (take-while (comp not (partial beyond-target? target) first)
-                (path-builder vel))))
-
-(defn path-height [target vel]
-  (let [path (build-path target vel)]
-    (when (within-target? target (last path))
-      (apply max (map second path)))))
-
-(def tnum-seq (iterate #(do [(+ (first %) (second %)) (inc (second %))]) [0 1]))
-
-(let [x (second (last (take-while #(< (first %) (first (first target-area))) tnum-seq)))]
-  (println
-    (apply max
-      (filter some?
-        (for [y (range -2000 2000)] (path-height target-area [x y]))))))
-
diff --git a/day17/part2.clj b/day17/partboth.clj
index 234818f..91b005c 100644
--- a/day17/part2.clj
+++ b/day17/partboth.clj
@@ -9,14 +9,12 @@
   (and (>= x tbx) (<= x tex) (<= y tby) (>= y tey)))
 
 (defn apply-velocity [[[px py] [vx vy]]]
-  [[(+ px vx) (+ py vy)] [(if (pos? vx) (dec vx) 0) (dec vy)]])
-
-(defn path-builder [vel] (iterate apply-velocity [initial-pos vel]))
+  [[(+ px vx) (+ py vy)] [(cond-> vx (pos? vx) dec) (dec vy)]])
 
 (defn build-path [target vel]
-  (->> (path-builder vel)
+  (->> (iterate apply-velocity [initial-pos vel])
        (take-while (comp not (partial beyond-target? target) first))
-       (map first)))
+       (mapv first)))
 
 (defn path-height [target vel]
   (let [path (build-path target vel)]
@@ -28,17 +26,12 @@
 
 (let [[tb te]      target-area
       lowest-x     (second (last (take-while #(< (first %) (first tb)) tnum-seq)))
-      lowest-y     (second te)
-      valid-paths  (filter (comp some? first)
-                    (for [y (range lowest-y 2000)]
-                      [(path-height target-area [lowest-x y]) y]))
-      highest-path (reduce #(if (> (first %1) (first %2)) %1 %2) valid-paths)]
-  (println (first highest-path))
+      highest-y    (dec (Math/abs (second te)))]
   (println
+    (path-height target-area [lowest-x highest-y])
     (count
       (filter (partial within-target? target-area)
-        (let [ys [(second te) (second highest-path)]]
-          (for [x (range lowest-x (inc (first te)))
-                y (range (apply min ys) (inc (apply max ys)))]
-            (last (build-path target-area [x y]))))))))
+        (for [x (range lowest-x (inc (first te)))
+              y (range (second te) (inc highest-y))]
+          (last (build-path target-area [x y])))))))