Finish day2, add project structure

[adventofcode2019.git] / src / adventofcode2019 / day01.clj

diff --git a/day01/fuel.clj b/src/adventofcode2019/day01.clj
similarity index 60%
rename from day01/fuel.clj
rename to src/adventofcode2019/day01.clj
index 916f45b73361f06e5d2a89f352aec8f9fea4fd64..5192833885082bea1fea29fd7764998899a6064e 100644 (file)
--- a/day01/fuel.clj
+++ b/src/adventofcode2019/day01.clj
@@ -1,11 +1,6 @@
-(ns aoc.core
-    [:require [clojure.string :as str]])
-
-(def get-list-from-file
-  #(str/split-lines (slurp %)))
-
-(def parse-int
-  #(Integer/parseInt %))
+(ns adventofcode2019.day01
+    [:require [adventofcode2019.lib :refer :all]
+              [clojure.string :as str]])
 
 (defn get-fuel-req [mass]
   (reduce + (take-while #(> % 0) (drop 1 (iterate #(- (quot % 3) 2) mass)))))
@@ -16,9 +11,7 @@
 (defn total-fuel-requirement [input]
   (reduce + (map get-fuel-req input)))
 
-(defn -main []
-  (let [input (map parse-int (get-list-from-file "input"))] 
+(defn day01 []
+  (let [input (map parse-int (get-list-from-file (input-file)))] 
     (println (total-fuel-requirement-naive input))
     (println (total-fuel-requirement input))))
-
-(-main)