From 2b209648d5d30d43b4ca95b7ea0aa6277c708605 Mon Sep 17 00:00:00 2001
From: Jonathan Chan <jonathanhwchan@gmail.com>
Date: Tue, 12 Dec 2017 09:28:47 -0800
Subject: [PATCH] Day 6, updated for part 2

---
 6.hs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/6.hs b/6.hs
index 79f67c4..25201e7 100644
--- a/6.hs
+++ b/6.hs
@@ -1,9 +1,9 @@
 import Data.Foldable
-import Data.HashSet
+import Data.HashMap
 import Data.Sequence
 
 type Bank   = Seq Int
-type Config = (Bank, Data.HashSet.HashSet [Int])
+type Config = (Bank, Data.HashMap.Map [Int] Int)
 
 (%) :: Int -> Int -> Int
 (%) = mod
@@ -16,22 +16,22 @@ nextBank :: Bank -> Bank
 nextBank bank =
     let len = Data.Sequence.length bank
         (index, value) = getMaxMem bank
-        zeroedBank = update index 0 bank
+        zeroedBank = Data.Sequence.update index 0 bank
         mappedBank = fmap (+ value `div` len) zeroedBank
         indicesToUpdate = fmap (% len) [(index + 1)..(index + value % len)]
     in  mapWithIndex (\i v -> if i `elem` indicesToUpdate then v + 1 else v) mappedBank
 
 
-cycles :: Int -> Config -> Int
+cycles :: Int -> Config -> (Int, Int)
 cycles count (prevBank, configs) =
     let bank = nextBank prevBank
         hashableBank    = Data.Foldable.toList bank
     in  if   member hashableBank configs
-        then count + 1
-        else cycles (count + 1) (bank, insert hashableBank configs)
+        then (count + 1, (count + 1) - findWithDefault undefined hashableBank configs)
+        else cycles (count + 1) (bank, insert hashableBank (count + 1) configs)
 
 main :: IO ()
 main = do
     input <- readFile "6.txt"
     let bank = Data.Sequence.fromList $ fmap read $ words input :: Bank
-    print $ cycles 0 (bank, Data.HashSet.empty)
+    print $ cycles 0 (bank, Data.HashMap.empty)