day15: cleanup a bit

Author: siraben

day15.hs

@@ -3,11 +3,12 @@
 import Criterion.Main
 import Data.Function
 import qualified Data.IntMap as IM
-import Data.IntMap.Strict (IntMap)
+import Data.IntMap (IntMap)
 import Data.IntSet (IntSet)
 import qualified Data.IntSet as IS
 import Data.Map (Map)
 import qualified Data.Map as M
+import Data.List
 
 type Grid = IntMap Int
 
@@ -61,7 +62,7 @@ embig = concat . take 5 . iterate (map (map succW)) . map (concat . take 5 . ite
 
 type PQueue a = IntMap [a]
 
--- pminView :: PQueue a -> ((Key, a), PQueue a)
+pminView :: PQueue a -> ((Int, a), PQueue a)
 pminView p =
   let Just (l, p') = IM.minViewWithKey p
    in case l of
@@ -74,8 +75,8 @@ pins k x = IM.insertWith (++) k [x]
 pempty :: PQueue a
 pempty = IM.empty
 
-neighbors :: Grid -> Int -> IntSet
-neighbors g p = IS.filter (`IM.member` g) (IS.fromList (conv <$> [(x -1, y), (x, y + 1), (x + 1, y), (x, y -1)]))
+neighbors :: Int -> [Int]
+neighbors p = conv <$> [(x -1, y), (x, y + 1), (x + 1, y), (x, y -1)]
   where
     (x, y) = from p
 
@@ -93,7 +94,7 @@ dijkstra g s = step1 & step2
         ((d, u), q') = pminView q
         unseen' = IS.delete u unseen
         -- for all neighbors of u, visit it and thread the distance map and priority queue
-        (dv', q'') = IS.foldl' visit (dv, q') (neighbors g u)
+        (dv', q'') = foldl' visit (dv, q') (neighbors u)
           where
             -- to visit a point p', make sure it's in the graph
             visit (dv, q') p'
@@ -106,10 +107,13 @@ dijkstra g s = step1 & step2
                 -- if it's better then update distance for p' in dv to be alt
                 (dv'', q'') = if alt < dv IM.! p' then (IM.insert p' alt dv, pins alt p' q') else (dv, q')
 
+part1 :: (Grid, Int) -> Int
 part1 (inp, n) = dijkstra inp (conv (1, 1)) IM.! conv (n, n)
 
+part2 :: (Grid, Int) -> Int
 part2 = part1
 
+main :: IO ()
 main = do
   let dayNumber = 15 :: Int
   let dayString = "day" <> show dayNumber

readme.md

@@ -353,17 +353,17 @@ variance introduced by outliers: 55% (severely inflated)
 
 ```
 benchmarking day15/part1
-time                 28.84 ms   (28.27 ms .. 29.51 ms)
-                     0.997 R²   (0.992 R² .. 0.999 R²)
-mean                 29.88 ms   (29.11 ms .. 31.74 ms)
-std dev              2.642 ms   (879.3 μs .. 4.691 ms)
-variance introduced by outliers: 34% (moderately inflated)
+time                 24.50 ms   (24.03 ms .. 24.98 ms)
+                     0.997 R²   (0.994 R² .. 0.999 R²)
+mean                 24.98 ms   (24.49 ms .. 26.32 ms)
+std dev              1.657 ms   (771.3 μs .. 3.205 ms)
+variance introduced by outliers: 25% (moderately inflated)
 
 benchmarking day15/part2
-time                 1.172 s    (1.088 s .. 1.259 s)
-                     0.999 R²   (0.997 R² .. 1.000 R²)
-mean                 1.213 s    (1.190 s .. 1.244 s)
-std dev              29.96 ms   (12.16 ms .. 39.32 ms)
+time                 1.051 s    (955.2 ms .. 1.137 s)
+                     0.998 R²   (0.998 R² .. 1.000 R²)
+mean                 1.098 s    (1.073 s .. 1.112 s)
+std dev              24.15 ms   (9.049 ms .. 32.99 ms)
 variance introduced by outliers: 19% (moderately inflated)
 ```
 </details>