MasseR/solidabis-koodihaaste
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Hlint fixes

Browse Source
This commit is contained in:
Mats Rauhala 2019-10-15 23:13:34 +03:00
parent e347b4753b
commit 7c8a298f71
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/API.hs
View File

@ -1,6 +1,5 @@
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE RecordWildCards #-} {-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeFamilies #-}
@ -63,6 +62,6 @@ handler =
findBest :: Model -> Text -> Either Text Text findBest :: Model -> Text -> Either Text Text
findBest model sentence = findBest model sentence =
let caesared = map (\n -> T.map (caesar n) . T.toLower $ sentence) [0..29] let caesared = map (\n -> T.map (caesar n) . T.toLower $ sentence) [0..29]
ranked = sortOn fst $ [(goodness model x, x) | x <- caesared] ranked = sortOn fst [(goodness model x, x) | x <- caesared]
found = find (\(rank, _) -> rank > -7.9) (reverse ranked) found = find (\(rank, _) -> rank > -7.9) (reverse ranked)
in maybe (Left sentence) (Right . snd) found in maybe (Left sentence) (Right . snd) found

8
src/Data/Language.hs
View File

@ -22,18 +22,18 @@ instance HasModel Model where
getModel = id getModel = id
setModel = const setModel = const
ngram_size :: Int ngramSize :: Int
ngram_size = 3 ngramSize = 3
buildModel :: Text -> Model buildModel :: Text -> Model
buildModel str = buildModel str =
let parts = ngram ngram_size str let parts = ngram ngramSize str
total = fold parts total = fold parts
in Model{..} in Model{..}
goodness :: Model -> Text -> Double goodness :: Model -> Text -> Double
goodness Model{..} str = goodness Model{..} str =
let comparison = M.keys $ ngram ngram_size str let comparison = M.keys $ ngram ngramSize str
ranksum = getSum $ foldMap (Sum . log . elm) comparison ranksum = getSum $ foldMap (Sum . log . elm) comparison
in ranksum / fromIntegral (length comparison) in ranksum / fromIntegral (length comparison)
where where