patrickaldis/garnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify part solver types

Browse Source 
This also gives us the flexibility to have all tests passing when only part 1 is complete.
This commit is contained in:
George Thomas 2025-12-02 11:14:54 +00:00
parent 778249c66b
commit 3601933bd0
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/Main.hs
View File

@ -34,9 +34,9 @@ puzzleTest p =
["examples", "real"] <&> \t -> ["examples", "real"] <&> \t ->
withResource (parseFile $ "inputs/" <> t <> "/" <> pt) mempty \input -> withResource (parseFile $ "inputs/" <> t <> "/" <> pt) mempty \input ->
testGroup t $ testGroup t $
[("1", p.part1), ("2", p.part2)] <&> \(n, pp) -> zip (map show [1 :: Int ..]) p.parts <&> \(n, pp) ->
goldenVsString n ("outputs/" <> t <> "/" <> pt <> "/" <> n) $ goldenVsString n ("outputs/" <> t <> "/" <> pt <> "/" <> n) $
BL.fromStrict . encodeUtf8 . pp.solve <$> input BL.fromStrict . encodeUtf8 . pp <$> input
where where
pt = show p.number pt = show p.number
parseFile fp = parseFile fp =
@ -46,11 +46,7 @@ puzzleTest p =
data Puzzle input = Puzzle data Puzzle input = Puzzle
{ number :: Word { number :: Word
, parser :: Parsec Void Text input , parser :: Parsec Void Text input
, part1 :: Part input , parts :: [input -> Text]
, part2 :: Part input
}
data Part input = Part
{ solve :: input -> Text
} }
puzzle1 :: Puzzle [(Direction, Inc)] puzzle1 :: Puzzle [(Direction, Inc)]
@ -58,19 +54,15 @@ puzzle1 =
Puzzle Puzzle
{ number = 1 { number = 1
, parser = flip sepEndBy newline $ (,) <$> ((char 'L' $> L) <|> (char 'R' $> R)) <*> (Inc <$> Lex.decimal) , parser = flip sepEndBy newline $ (,) <$> ((char 'L' $> L) <|> (char 'R' $> R)) <*> (Inc <$> Lex.decimal)
, part1 = , parts =
Part [
{ solve =
T.show T.show
. sum . sum
. flip evalState 50 . flip evalState 50
. traverse \(d, i) -> state \p -> . traverse \(d, i) -> state \p ->
let (_, p') = step i d p let (_, p') = step i d p
in (Count if p' == 0 then 1 else 0, p') in (Count if p' == 0 then 1 else 0, p')
} ,
, part2 =
Part
{ solve =
T.show T.show
. sum . sum
. flip evalState 50 . flip evalState 50
@ -84,7 +76,7 @@ puzzle1 =
| p' == 0 -> abs c + 1 | p' == 0 -> abs c + 1
| otherwise -> abs c | otherwise -> abs c
in (c', p') in (c', p')
} ]
} }
data Direction = L | R data Direction = L | R
@ -109,15 +101,13 @@ puzzle2 =
Puzzle Puzzle
{ number = 2 { number = 2
, parser = (<* newline) $ flip sepBy (char ',') $ (,) <$> (Lex.decimal <* char '-') <*> Lex.decimal , parser = (<* newline) $ flip sepBy (char ',') $ (,) <$> (Lex.decimal <* char '-') <*> Lex.decimal
, part1 = , parts =
Part [
{ solve =
T.show T.show
. sum . sum
. concatMap . concatMap
(mapMaybe (\n -> guard (isRepetition n) $> n) . uncurry enumFromTo) (mapMaybe (\n -> guard (isRepetition n) $> n) . uncurry enumFromTo)
} ]
, part2 = error "part 2 incomplete"
} }
newtype ID = ID Int newtype ID = ID Int