day3: little more touch-up

day3/part1.clj

@@ -1,6 +1,5 @@
 (require '[clojure.string :as str])
 
-(println
 (->> "./in"
      (slurp)
      (str/split-lines)
@@ -10,7 +9,7 @@
      (str/join)
      (#(Integer/parseInt % 2))
      (#(* % (bit-xor % (dec (int (Math/pow 2 12))))))
-       )
+     (println)
      )
 
 ; (->> input data file name
@@ -22,4 +21,5 @@
 ;      join characters into single string
 ;      convert binary string to a number (gamma)
 ;      multiply gamma by its bit-inverse (bit length hard-coded)
+;      print results
 

day3/part2.clj

@@ -1,12 +1,11 @@
+(require '[clojure.string :as str])
+
 (def bitcount 12)
 (def input
-  (loop [tot []]
+  (->> "./in"
-    (let [line (read-line)]
+      (slurp)
-      (if (empty? line)
+      (str/split-lines)
-        tot
+      (map #(Integer/parseInt % 2))
-        (recur (conj tot (Integer/parseInt line 2)))
-        )
-      )
       )
   )
 
@@ -16,27 +15,17 @@
        (apply +)
        )
   )
+
 (defn filterbit [lst bit v]
   (if (= 1 (count lst))
     lst
-    (loop [l lst r []]
+    (filter #(= (bit-test % bit) v) lst)
-      (if (empty? l)
-        r
-        (recur
-          (rest l)
-          (if (= (bit-test (first l) bit) v)
-            (conj r (first l))
-            r
-            )
-          )
-        )
-      )
     )
   )
 
 (loop [bit (dec bitcount) lst0 input lst1 input]
   (if (and (= 1 (count lst0)) (= 1 (count lst1)))
-    (println (* (first lst0) (first lst1)))
+    (println (map * lst0 lst1))
     (recur
       (dec bit)
       (filterbit lst0 bit (>= (countbit lst0 bit) (/ (count lst0) 2)))