Clean up day12p2
This commit is contained in:
parent
c17b3371f4
commit
c8b7557a06
|
|
@ -1,9 +1,7 @@
|
||||||
module Day12 where
|
module Day12 where
|
||||||
import qualified Data.HashSet
|
import Data.Map ( Map, fromList, unionWith, empty, (!) )
|
||||||
import Data.Map ( Map, fromList, unionWith, empty, toList, (!) )
|
|
||||||
import Data.List.Split (splitOn)
|
import Data.List.Split (splitOn)
|
||||||
import qualified Data.Char
|
import qualified Data.Char
|
||||||
import Data.Maybe (mapMaybe)
|
|
||||||
|
|
||||||
type Path = (String,String)
|
type Path = (String,String)
|
||||||
type System = Map String [String]
|
type System = Map String [String]
|
||||||
|
|
@ -24,16 +22,12 @@ pathFinder sys p@("end":xs) = [p]
|
||||||
pathFinder sys p@(x:xs) = concatMap (\next -> pathFinder sys (next:p)) elig
|
pathFinder sys p@(x:xs) = concatMap (\next -> pathFinder sys (next:p)) elig
|
||||||
where elig = filter (\cave -> isUpper cave || cave `notElem` p) (sys ! x)
|
where elig = filter (\cave -> isUpper cave || cave `notElem` p) (sys ! x)
|
||||||
|
|
||||||
pathFinder2 :: System -> [String] -> Bool -> [[String]]
|
pathFinder2 :: System -> [String] -> [[String]]
|
||||||
pathFinder2 sys p@("end":xs) _ = [p]
|
pathFinder2 sys p@("end":xs) = [p]
|
||||||
pathFinder2 sys p@(x:xs) True = concatMap (\next -> pathFinder2 sys (next:p) True) elig
|
pathFinder2 sys p@(x:xs) = concatMap (\next -> f next sys (next:p)) elig
|
||||||
where elig = filter (\cave -> isUpper cave || cave `notElem` p) (sys ! x)
|
|
||||||
pathFinder2 sys p@(x:xs) False = concatMap (\next -> pathFinder2 sys (next:p) (dup next)) elig
|
|
||||||
where
|
where
|
||||||
|
f cave = if isUpper cave || cave `notElem` p then pathFinder2 else pathFinder
|
||||||
elig = filter (/= "start") (sys ! x)
|
elig = filter (/= "start") (sys ! x)
|
||||||
dup cave = isLower cave && cave `elem` p
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
main :: IO ()
|
main :: IO ()
|
||||||
main = do
|
main = do
|
||||||
|
|
@ -45,5 +39,5 @@ main = do
|
||||||
print $ length paths
|
print $ length paths
|
||||||
|
|
||||||
putStrLn "part 2: "
|
putStrLn "part 2: "
|
||||||
let paths = map reverse $ pathFinder2 system ["start"] False
|
let paths = map reverse $ pathFinder2 system ["start"]
|
||||||
print $ length paths
|
print $ length paths
|
||||||
Loading…
Reference in New Issue