Implement matches

doc-jan-haskell.cabal

@@ -38,6 +38,7 @@ library
     build-depends:
         base >= 4.17.2 && < 4.18,
         containers >= 0.6.7 && < 0.7,
+        filepath,
         mtl >= 2.2.2 && < 2.3,
         text  >= 2.0.2 && < 2.1,
         transformers >= 0.5.6 && < 0.6,

src/Year2023/Solver.hs

@@ -55,7 +55,9 @@ matches clue (Charade _ t1 t2)   = or [ matches c1 t1 && matches c2 t2
 
 evaluate :: Parse -> Int -> [String]
 evaluate (defs, _, tree) size
-  = undefined
+  = concatMap (filter isMatch . synonyms) defs
+  where
+    isMatch syn = length syn >= size && matches syn tree
 
 ------------------------------------------------------
 -- Part III
@@ -68,9 +70,9 @@ parseWordplay ws
             parseReversal ws,
             parseInsertion ws,
             parseCharade ws]
-    
+
 parseSynonym :: [String] -> [ParseTree]
-parseSynonym 
+parseSynonym
   = const []
 
 parseAnagram :: [String] -> [ParseTree]
@@ -86,7 +88,7 @@ parseInsertion
   = const []
 
 parseCharade :: [String] -> [ParseTree]
-parseCharade 
+parseCharade
   = const []
 
 -- Given...
@@ -99,7 +101,7 @@ parseClueText
   = undefined
 
 solve :: Clue -> [Solution]
-solve 
+solve
   = undefined
 
 

src/Year2023/WordData.hs

@@ -1,3 +1,7 @@
+-- > This is needed to access __FILE__, the macro for the path of the current
+-- > source file. See the comment on "thesaurus".
+{-# LANGUAGE CPP #-}
+
 module Year2023.WordData where
 
 import System.IO
@@ -6,6 +10,8 @@ import System.IO.Unsafe
 import qualified Data.Text as Text
 import qualified Data.Text.IO as TextIO
 import qualified Data.Map as Map
+
+import System.FilePath
 
 synonyms :: String -> [String]
 synonyms s
@@ -14,11 +20,15 @@ synonyms s
     lookUp x t
       = fromMaybe [] (Map.lookup x t)
 
+-- > The original skeleton code simply reads from the path "thesaurus.txt".
+-- > However, this no longer works when I incorporate all previous tests into
+-- > this single repo as the directory layout has been altered. Therefore I
+-- > use the macro __FILE__ to always locate the thesaurus file relatively.
 thesaurus :: Map.Map String [String]
 thesaurus
-  = unsafePerformIO $ 
+  = unsafePerformIO $
     do 
-      ls <- fmap Text.lines (TextIO.readFile "thesaurus.txt")
+      ls <- fmap Text.lines (TextIO.readFile $ replaceFileName __FILE__ "thesaurus.txt")
       return (Map.fromList (fmap (readSyns . Text.unpack) ls))
 
 readWord :: String -> String