Refactor - introducte Probability file

geval.cabal

@@ -26,6 +26,7 @@ library
                      , GEval.PrecisionRecall
                      , GEval.ClusteringMetrics
                      , GEval.Common
+                     , GEval.Probability
                      , GEval.LogLossHashed
                      , GEval.CharMatch
                      , GEval.LineByLine

src/GEval/ProbList.hs

@@ -7,24 +7,7 @@ module GEval.ProbList
 import qualified Data.Text as T
 
 import GEval.Common
-
+import GEval.Probability
-
-newtype Probability = P { getP :: Double }
-    deriving (Eq,Ord,Show)
-
-isProbability :: Double -> Bool
-isProbability p = 0.0 <= p && p <= 1.0
-
-mkProbability :: Double -> Probability
-mkProbability p
-  | isProbability p = P p
-  | otherwise = error $ show p ++ " is not in [0, 1]"
-
-probabilityOne :: Probability
-probabilityOne = mkProbability 1.0
-
-probabilityZero :: Probability
-probabilityZero = mkProbability 0.0
 
 data ProbList = ProbList [WordWithProb]
   deriving (Show)

src/GEval/Probability.hs

@@ -0,0 +1,21 @@
+
+module GEval.Probability
+       (Probability, getP, isProbability, mkProbability, probabilityOne, probabilityZero)
+       where
+
+newtype Probability = P { getP :: Double }
+    deriving (Eq, Ord, Show)
+
+isProbability :: Double -> Bool
+isProbability p = 0.0 <= p && p <= 1.0
+
+mkProbability :: Double -> Probability
+mkProbability p
+  | isProbability p = P p
+  | otherwise = error $ show p ++ " is not in [0, 1]"
+
+probabilityOne :: Probability
+probabilityOne = mkProbability 1.0
+
+probabilityZero :: Probability
+probabilityZero = mkProbability 0.0