ulysses4ever
diff --git a/Diff for: ‎Main.hs
+21 b/Diff for: ‎Main.hs
+21
diff --git a/Diff for: ‎README.md
+7-1 b/Diff for: ‎README.md
+7-1
diff --git a/Diff for: ‎2020/day-1.hs renamed to ‎Y2020/day-1.hs b/Diff for: ‎2020/day-1.hs renamed to ‎Y2020/day-1.hs
diff --git a/Diff for: ‎2020/day-10.hs renamed to ‎Y2020/day-10.hs b/Diff for: ‎2020/day-10.hs renamed to ‎Y2020/day-10.hs
diff --git a/Diff for: ‎2020/day-11.hs renamed to ‎Y2020/day-11.hs b/Diff for: ‎2020/day-11.hs renamed to ‎Y2020/day-11.hs
diff --git a/Diff for: ‎2020/day-12.hs renamed to ‎Y2020/day-12.hs b/Diff for: ‎2020/day-12.hs renamed to ‎Y2020/day-12.hs
diff --git a/Diff for: ‎2020/day-13.hs renamed to ‎Y2020/day-13.hs b/Diff for: ‎2020/day-13.hs renamed to ‎Y2020/day-13.hs
diff --git a/Diff for: ‎2020/day-14.hs renamed to ‎Y2020/day-14.hs b/Diff for: ‎2020/day-14.hs renamed to ‎Y2020/day-14.hs
diff --git a/Diff for: ‎2020/day-15.hs renamed to ‎Y2020/day-15.hs b/Diff for: ‎2020/day-15.hs renamed to ‎Y2020/day-15.hs
diff --git a/Diff for: ‎2020/day-17.hs renamed to ‎Y2020/day-17.hs b/Diff for: ‎2020/day-17.hs renamed to ‎Y2020/day-17.hs
diff --git a/Diff for: ‎2020/day-18.hs renamed to ‎Y2020/day-18.hs b/Diff for: ‎2020/day-18.hs renamed to ‎Y2020/day-18.hs
diff --git a/Diff for: ‎2020/day-19.hs renamed to ‎Y2020/day-19.hs b/Diff for: ‎2020/day-19.hs renamed to ‎Y2020/day-19.hs
diff --git a/Diff for: ‎2020/day-2.hs renamed to ‎Y2020/day-2.hs b/Diff for: ‎2020/day-2.hs renamed to ‎Y2020/day-2.hs
diff --git a/Diff for: ‎2020/day-3.hs renamed to ‎Y2020/day-3.hs b/Diff for: ‎2020/day-3.hs renamed to ‎Y2020/day-3.hs
diff --git a/Diff for: ‎2020/day-4.hs renamed to ‎Y2020/day-4.hs b/Diff for: ‎2020/day-4.hs renamed to ‎Y2020/day-4.hs
diff --git a/Diff for: ‎2020/day-5.hs renamed to ‎Y2020/day-5.hs b/Diff for: ‎2020/day-5.hs renamed to ‎Y2020/day-5.hs
diff --git a/Diff for: ‎2020/day-6.hs renamed to ‎Y2020/day-6.hs b/Diff for: ‎2020/day-6.hs renamed to ‎Y2020/day-6.hs
diff --git a/Diff for: ‎2020/day-7.hs renamed to ‎Y2020/day-7.hs b/Diff for: ‎2020/day-7.hs renamed to ‎Y2020/day-7.hs
diff --git a/Diff for: ‎2020/day-8.hs renamed to ‎Y2020/day-8.hs b/Diff for: ‎2020/day-8.hs renamed to ‎Y2020/day-8.hs
diff --git a/Diff for: ‎2020/day-9.hs renamed to ‎Y2020/day-9.hs b/Diff for: ‎2020/day-9.hs renamed to ‎Y2020/day-9.hs
diff --git a/Diff for: ‎2020/input/day-1.txt renamed to ‎Y2020/input/day-1.txt b/Diff for: ‎2020/input/day-1.txt renamed to ‎Y2020/input/day-1.txt
diff --git a/Diff for: ‎2020/input/day-10-test-2.txt renamed to ‎Y2020/input/day-10-test-2.txt b/Diff for: ‎2020/input/day-10-test-2.txt renamed to ‎Y2020/input/day-10-test-2.txt
diff --git a/Diff for: ‎2020/input/day-10-test.txt renamed to ‎Y2020/input/day-10-test.txt b/Diff for: ‎2020/input/day-10-test.txt renamed to ‎Y2020/input/day-10-test.txt
diff --git a/Diff for: ‎2020/input/day-10.txt renamed to ‎Y2020/input/day-10.txt b/Diff for: ‎2020/input/day-10.txt renamed to ‎Y2020/input/day-10.txt
diff --git a/Diff for: ‎2020/input/day-11-test-2.txt renamed to ‎Y2020/input/day-11-test-2.txt b/Diff for: ‎2020/input/day-11-test-2.txt renamed to ‎Y2020/input/day-11-test-2.txt
diff --git a/Diff for: ‎2020/input/day-11-test.txt renamed to ‎Y2020/input/day-11-test.txt b/Diff for: ‎2020/input/day-11-test.txt renamed to ‎Y2020/input/day-11-test.txt
diff --git a/Diff for: ‎2020/input/day-11.txt renamed to ‎Y2020/input/day-11.txt b/Diff for: ‎2020/input/day-11.txt renamed to ‎Y2020/input/day-11.txt
diff --git a/Diff for: ‎2020/input/day-12-test.txt renamed to ‎Y2020/input/day-12-test.txt b/Diff for: ‎2020/input/day-12-test.txt renamed to ‎Y2020/input/day-12-test.txt
diff --git a/Diff for: ‎2020/input/day-12.txt renamed to ‎Y2020/input/day-12.txt b/Diff for: ‎2020/input/day-12.txt renamed to ‎Y2020/input/day-12.txt
diff --git a/Diff for: ‎2020/input/day-13.txt renamed to ‎Y2020/input/day-13.txt b/Diff for: ‎2020/input/day-13.txt renamed to ‎Y2020/input/day-13.txt
diff --git a/Diff for: ‎2020/input/day-14-test.txt renamed to ‎Y2020/input/day-14-test.txt b/Diff for: ‎2020/input/day-14-test.txt renamed to ‎Y2020/input/day-14-test.txt
diff --git a/Diff for: ‎2020/input/day-14.txt renamed to ‎Y2020/input/day-14.txt b/Diff for: ‎2020/input/day-14.txt renamed to ‎Y2020/input/day-14.txt
diff --git a/Diff for: ‎2020/input/day-17-test.txt renamed to ‎Y2020/input/day-17-test.txt b/Diff for: ‎2020/input/day-17-test.txt renamed to ‎Y2020/input/day-17-test.txt
diff --git a/Diff for: ‎2020/input/day-17.txt renamed to ‎Y2020/input/day-17.txt b/Diff for: ‎2020/input/day-17.txt renamed to ‎Y2020/input/day-17.txt
diff --git a/Diff for: ‎2020/input/day-18.txt renamed to ‎Y2020/input/day-18.txt b/Diff for: ‎2020/input/day-18.txt renamed to ‎Y2020/input/day-18.txt
diff --git a/Diff for: ‎2020/input/day-19-test-2.txt renamed to ‎Y2020/input/day-19-test-2.txt b/Diff for: ‎2020/input/day-19-test-2.txt renamed to ‎Y2020/input/day-19-test-2.txt
diff --git a/Diff for: ‎2020/input/day-19-test.txt renamed to ‎Y2020/input/day-19-test.txt b/Diff for: ‎2020/input/day-19-test.txt renamed to ‎Y2020/input/day-19-test.txt
diff --git a/Diff for: ‎2020/input/day-19.txt renamed to ‎Y2020/input/day-19.txt b/Diff for: ‎2020/input/day-19.txt renamed to ‎Y2020/input/day-19.txt
diff --git a/Diff for: ‎2020/input/day-2.txt renamed to ‎Y2020/input/day-2.txt b/Diff for: ‎2020/input/day-2.txt renamed to ‎Y2020/input/day-2.txt
diff --git a/Diff for: ‎2020/input/day-3.txt renamed to ‎Y2020/input/day-3.txt b/Diff for: ‎2020/input/day-3.txt renamed to ‎Y2020/input/day-3.txt
diff --git a/Diff for: ‎2020/input/day-4-test-invalid.txt renamed to ‎Y2020/input/day-4-test-invalid.txt b/Diff for: ‎2020/input/day-4-test-invalid.txt renamed to ‎Y2020/input/day-4-test-invalid.txt
diff --git a/Diff for: ‎2020/input/day-4-test-valid.txt renamed to ‎Y2020/input/day-4-test-valid.txt b/Diff for: ‎2020/input/day-4-test-valid.txt renamed to ‎Y2020/input/day-4-test-valid.txt
diff --git a/Diff for: ‎2020/input/day-4.txt renamed to ‎Y2020/input/day-4.txt b/Diff for: ‎2020/input/day-4.txt renamed to ‎Y2020/input/day-4.txt
diff --git a/Diff for: ‎2020/input/day-5.txt renamed to ‎Y2020/input/day-5.txt b/Diff for: ‎2020/input/day-5.txt renamed to ‎Y2020/input/day-5.txt
diff --git a/Diff for: ‎2020/input/day-6.txt renamed to ‎Y2020/input/day-6.txt b/Diff for: ‎2020/input/day-6.txt renamed to ‎Y2020/input/day-6.txt
diff --git a/Diff for: ‎2020/input/day-7.txt renamed to ‎Y2020/input/day-7.txt b/Diff for: ‎2020/input/day-7.txt renamed to ‎Y2020/input/day-7.txt
diff --git a/Diff for: ‎2020/input/day-8-test.txt renamed to ‎Y2020/input/day-8-test.txt b/Diff for: ‎2020/input/day-8-test.txt renamed to ‎Y2020/input/day-8-test.txt
diff --git a/Diff for: ‎2020/input/day-8.txt renamed to ‎Y2020/input/day-8.txt b/Diff for: ‎2020/input/day-8.txt renamed to ‎Y2020/input/day-8.txt
diff --git a/Diff for: ‎2020/input/day-9-test.txt renamed to ‎Y2020/input/day-9-test.txt b/Diff for: ‎2020/input/day-9-test.txt renamed to ‎Y2020/input/day-9-test.txt
diff --git a/Diff for: ‎2020/input/day-9.txt renamed to ‎Y2020/input/day-9.txt b/Diff for: ‎2020/input/day-9.txt renamed to ‎Y2020/input/day-9.txt
diff --git a/Diff for: ‎Y2021/Day1.hs
+11 b/Diff for: ‎Y2021/Day1.hs
+11
@@ -0,0 +1,21 @@
+module Main where
+
+import Y2021.Day1
+
+defaultYear = 2021
+
+solutions = [
+  (2021, 1) -> (Y2021.Day1.solve1, Y2021.Day1.solve2)
+  ]
+
+main = do
+  args <- getArgs
+  yearAndDay@(y, d) <- case args of
+    [y, d] -> return (y, d)
+    [d]    -> return (defaultYear, d)
+    _      -> error "Provide one (day) or two (year, day) arguments"
+  let Just (s1, s2) = lookup solutions yearAndDay 
+  input <- readFile $ "Y" ++ (show y) ++ "/input/day-" ++ show d ++ ".txt" 
+  print (s1 input)
+  print (s2 input)
+
@@ -0,0 +1,11 @@
+{-# language BangPatterns #-}
+module Day1 (solve1, solve2)
+
+solve1 :: String -> IO ()
+solve1 = undefined
+
+countInc :: [Int] -> Int
+countInc xs = foldl1' (((x, x'), !s) -> if x < x' then s + 1 else s) (zip xs tail xs)
+
+solve2 = undefined
+