Garmelon/jotto-solver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up

Browse source
This commit is contained in:
Joscha 2018-09-20 19:07:16 +00:00
parent 2a9f7c6f6b
commit dfc628d090
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/Main.hs
View file

@ -1,8 +1,8 @@
module Main where module Main where
import Control.Monad import Control.Monad
import Data.List
import Data.Char import Data.Char
import Data.List
import System.Environment import System.Environment
import System.Exit import System.Exit

10
src/Jotto.hs
View file

@ -60,7 +60,7 @@ buildClassMap n = foldr addWord M.empty . preprocessWords
Nothing -> cmap Nothing -> cmap
Just set -> M.alter (appendWord word) set cmap Just set -> M.alter (appendWord word) set cmap
appendWord :: String -> Maybe [String] -> Maybe [String] appendWord :: String -> Maybe [String] -> Maybe [String]
appendWord word Nothing = Just [word] appendWord word Nothing = Just [word]
appendWord word (Just ws) = Just $ word : ws appendWord word (Just ws) = Just $ word : ws
classMapWordCount :: ClassMap -> Int classMapWordCount :: ClassMap -> Int
@ -69,8 +69,8 @@ classMapWordCount = sum . M.map length
{- Basic guessing operations -} {- Basic guessing operations -}
data GuessState = GuessState data GuessState = GuessState
{ guessed :: [Guess] { guessed :: [Guess]
, allWords :: ClassMap , allWords :: ClassMap
} deriving (Show) } deriving (Show)
score :: Class -> Class -> Int score :: Class -> Class -> Int
@ -100,7 +100,7 @@ guessState :: ClassMap -> GuessState
guessState cmap = GuessState{guessed=[], allWords=cmap} guessState cmap = GuessState{guessed=[], allWords=cmap}
addGuess :: Guess -> GuessState -> GuessState addGuess :: Guess -> GuessState -> GuessState
addGuess guess g = g{guessed=guess : (guessed g)} addGuess guess g = g{guessed=guess : guessed g}
removeGuess :: String -> GuessState -> GuessState removeGuess :: String -> GuessState -> GuessState
removeGuess w g = removeGuess w g =
@ -158,7 +158,7 @@ worstCase c cmap =
nextGuesses :: GuessState -> [(Int, [String])] nextGuesses :: GuessState -> [(Int, [String])]
nextGuesses g = nextGuesses g =
let pwords = possibleWords g let pwords = possibleWords g
lpwords = M.map length $ pwords lpwords = M.map length pwords
pclasses = M.keysSet pwords pclasses = M.keysSet pwords
options1 = M.assocs $ allWords g options1 = M.assocs $ allWords g
options2 = parMap rdeepseq (\(set, w) -> (set, worstCase set lpwords, w)) options1 options2 = parMap rdeepseq (\(set, w) -> (set, worstCase set lpwords, w)) options1