day10 part two WIP

aoc2024.cabal

@@ -25,6 +25,7 @@ source-repository head
 
 library
   exposed-modules:
+      Data.HashSet.Extra
       Data.List.Extra
       Data.Matrix
       Data.Point
@@ -59,6 +60,7 @@ test-suite aoc2024-test
   type: exitcode-stdio-1.0
   main-is: Spec.hs
   other-modules:
+      Day10Spec
       Day1Spec
       Day2Spec
       Day3Spec

src/Data/HashSet/Extra.hs

@@ -0,0 +1,7 @@
+module Data.HashSet.Extra (unionMap) where
+
+import Data.HashSet (HashSet)
+import qualified Data.HashSet as HashSet
+
+unionMap :: (Eq b) => (a -> HashSet b) -> HashSet a -> HashSet b
+unionMap f set = HashSet.unions $ map f (HashSet.toList set)

src/Day10.hs

@@ -7,22 +7,29 @@ import qualified Data.Matrix as M
 import Data.Point (Point)
 
 partOne :: String -> Int
-partOne input = length $ filter (uncurry (isReachable matrix)) candidates
+partOne input = length $ filter ((> 0) . uncurry (rating matrix)) candidates
   where
     matrix = parseMatrix input
-    trailHeads = M.points $ M.filter (== 0) matrix
+    candidates = possibleTrails matrix
-    trailEnds = M.points $ M.filter (== 9) matrix
-    candidates = concatMap (zip trailHeads . repeat) trailEnds
 
-isReachable :: Matrix Int -> Point -> Point -> Bool
+partTwo :: String -> Int
-isReachable matrix x y = go (getCandidates 1 x) [y] 1
+partTwo input = sum $ map (uncurry (rating matrix)) candidates
   where
-    go :: [Point] -> [Point] -> Int -> Bool
+    matrix = parseMatrix input
-    go _ _ 9 = False
+    candidates = possibleTrails matrix
+
+rating :: Matrix Int -> Point -> Point -> Int
+rating matrix x y = go (getCandidates 1 x) [y] 1
+  where
+    go :: [Point] -> [Point] -> Int -> Int
+    go _ _ 6 = 0
     go leftFront rightFront step =
       let leftFront' = concatMap (getCandidates (1 + step)) leftFront
           rightFront' = concatMap (getCandidates (9 - step)) rightFront
-       in not (null (leftFront `intersect` rightFront)) || go leftFront' rightFront' (step + 1)
+          intersection = intersect leftFront rightFront
+       in if not (null intersection)
+            then length intersection
+            else go leftFront' rightFront' (step + 1)
 
     getCandidates :: Int -> Point -> [Point]
     getCandidates value (row, col) =
@@ -36,8 +43,11 @@ isReachable matrix x y = go (getCandidates 1 x) [y] 1
               )
             $ zip positions values
 
-partTwo :: String -> Int
+possibleTrails :: Matrix Int -> [(Point, Point)]
-partTwo input = 0
+possibleTrails matrix =
+  let trailHeads = M.points $ M.filter (== 0) matrix
+      trailEnds = M.points $ M.filter (== 9) matrix
+   in concatMap (zip trailHeads . repeat) trailEnds
 
 parseMatrix :: String -> Matrix Int
 parseMatrix = M.buildMatrix . map (map digitToInt) . lines

test/Day10Spec.hs

@@ -0,0 +1,23 @@
+module Day10Spec (spec) where
+
+import Day10 (partOne, partTwo)
+import Test.Hspec
+
+spec :: Spec
+spec = do
+  describe "PartOne" $ do
+    it "works" $ do
+      partOne input `shouldBe` 36
+  describe "PartTwo" $ do
+    it "works" $ do
+      partTwo input `shouldBe` 81
+  where
+    input =
+      "89010123\n\
+      \78121874\n\
+      \87430965\n\
+      \96549874\n\
+      \45678903\n\
+      \32019012\n\
+      \01329801\n\
+      \10456732\n"