rearrange

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>

Day1/1.hs

@@ -1,4 +0,0 @@
-import Lib (calories)
-
-main :: IO ()
-main = print . maximum . calories =<< readFile "input"

Day1/2.hs

@@ -1,6 +0,0 @@
-import Data.List (sortOn)
-import Data.Ord (Down (Down))
-import Lib (calories)
-
-main :: IO ()
-main = print . sum . take 3 . sortOn Down . calories =<< readFile "input"

Lib.hs

@@ -1,9 +1,4 @@
-module Lib (calories) where
-
-calories :: String -> [Integer]
-calories input =
-  map (sum . map read) $
-    filter (not . null) $ split "" $ split '\n' input
+module Lib (split) where
 
 split :: Eq a => a -> [a] -> [[a]]
 split del =

day1.hs

@@ -0,0 +1,24 @@
+import Data.List (sortOn)
+import Data.Ord (Down (Down))
+import Lib (split)
+
+main :: IO ()
+main = do
+  input <- readFile "day1.in"
+  putStr "Q1: "
+  print $ q1 input
+  putStr "Q2: "
+  print $ q2 input
+
+q1 :: String -> Int
+q1 = maximum . calories
+
+q2 :: String -> Int
+q2 = sum . take 3 . sortOn Down . calories
+
+calories :: String -> [Int]
+calories =
+  map (sum . map read)
+    . filter (not . null)
+    . split ""
+    . split '\n'