From 3ec19487533f4fe901f1823a3f2b2d9dec5ca5a5 Mon Sep 17 00:00:00 2001
From: "Yann Esposito (Yogsototh)" <yann.esposito@gmail.com>
Date: Thu, 21 Dec 2017 12:45:40 +0100
Subject: [PATCH] Day 17*

---
 app/Main.hs  |  2 +-
 src/Day17.hs | 46 ++++++++++++++++++++++++++--------------------
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/app/Main.hs b/app/Main.hs
index 6d11e86..547069f 100644
--- a/app/Main.hs
+++ b/app/Main.hs
@@ -200,7 +200,7 @@ day16 = do
 day17 :: IO ()
 day17 = do
   putText "Day 17:"
-  sol1 <- Day17.solution1 2017 Day17.input
+  let sol1 = Day17.solution1 2017 Day17.input
   showSol "Solution 1" (int (fromMaybe 0 sol1))
   let sol2 = Day17.solution2 50000000 Day17.input
   showSol "Solution 2" (int sol2)
diff --git a/src/Day17.hs b/src/Day17.hs
index b31f0bb..3ed3150 100644
--- a/src/Day17.hs
+++ b/src/Day17.hs
@@ -101,7 +101,7 @@ nextPreStep nbSteps b@Buffer{..} =
 
 showBuffer :: Buffer -> Text
 showBuffer Buffer{..} =
-  zip  [0..] elems
+  zip  [0..] (take 30 elems)
   & map (\(i,v) -> if i == pos
                      then "(" <> show v <> ") "
                      else show v <> " ")
@@ -124,38 +124,44 @@ addElem roundNumber b@Buffer {..} =
                ++ [roundNumber]
                ++ drop (pos + 1) elems
 
-solution1 :: Int -> Int -> IO (Maybe Int)
-solution1 nbOcc nbSteps = go initState 0
+solution1 :: Int -> Int -> Maybe Int
+solution1 nbOcc nbSteps = finalState & elems & elemAt (1 + (pos finalState))
   where
     initState = Buffer [0] 0
-    go st n
-      | n == nbOcc = st & elems & elemAt (1 + (pos st)) & return
-      | otherwise = do
-            -- print st
-            -- putText $ "> " <> showBuffer st
-            go (nextStep nbSteps (n+1) st) (n+1)
-    elemAt :: Int -> [a] -> Maybe a
-    elemAt 0 (x:xs) = Just x
-    elemAt n (_:xs) = elemAt (n-1) xs
-    elemAt _ _      = Nothing
+    finalState = genState nbOcc nbSteps 0 initState
+
+genState :: Int -> Int -> Int -> Buffer -> Buffer
+genState nbOcc nbSteps n st
+  | n == nbOcc = -- traceShow st $
+                 st
+  | otherwise = -- traceShow (showBuffer st) $
+                genState  nbOcc nbSteps (n+1) (nextStep nbSteps (n+1) st)
+
+elemAt :: Int -> [a] -> Maybe a
+elemAt 0 (x:xs) = Just x
+elemAt n (_:xs) = elemAt (n-1) xs
+elemAt _ _      = Nothing
 
 data Buf2 = Buf2 { position :: Int
                  , size :: Int
                  , lastSol :: Int
                  }
 
+
+
 solution2 :: Int -> Int -> Int
 solution2 nbOcc nbSteps = go initState 1
   where
     initState = Buf2 0 1 0
     go st@Buf2{..} n
       | n == nbOcc = lastSol
-      | (position + nbSteps) `rem` size == 0 =
-          traceShow n $ go (st { position = 1
-                               , lastSol = n
-                               , size = size + 1
-                               })
-                           (n+1)
-      | otherwise = go (st { position = (1 + position + nbSteps) `rem` size
+      | (1 + position + nbSteps) `rem` size == 0 =
+          -- traceShow n $
+          go (st { position = (1 + position + nbSteps) `rem` size
+                 , lastSol = n
+                 , size = size + 1
+                 })
+             (n+1)
+      | otherwise = go (st { position = (1+ position + nbSteps) `rem` size
                            , size = size + 1 })
                        (n+1)