phonetic-languages-simplified-properties-lists 0.1.3.1 → 0.2.0.0

raw patch · 3 files changed

+6/−105 lines, 3 filesdep ~basedep ~phonetic-languages-simplified-commonPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: base, phonetic-languages-simplified-common

API changes (from Hackage documentation)

Files

• CHANGELOG.md +4/−0
• Phonetic/Languages/Lists/Ukrainian/PropertiesFuncRepG.hs +0/−103
• phonetic-languages-simplified-properties-lists.cabal +2/−2

@@ -21,3 +21,7 @@  * First version revised D. Some code optimizations. +## 0.2.0.0 -- 2020-11-28++* Second version. Removed the unnecessary neg functions. Dependencies boundaries changes.+

@@ -14,23 +14,15 @@ module Phonetic.Languages.Lists.Ukrainian.PropertiesFuncRepG (   -- * Functions with 'Int16'   procDiverse2I-  , procDiverse2Ineg   -- * Functions with 'Float'   , procDiverse2F-  , procDiverse2Fneg   , procRhythmicity23F-  , procRhythmicity23Fneg   , procBothF-  , procBothFneg   , procBothInvF-  , procBothInvFneg   -- ** Working with generated by r-glpk-phonetic-languages-ukrainian-durations syllable durations   , procRhythmicity232F-  , procRhythmicity232Fneg   , procBoth2F-  , procBoth2Fneg   , procBoth2InvF-  , procBoth2InvFneg ) where  #ifdef __GLASGOW_HASKELL__@@ -65,25 +57,12 @@ procDiverse2I g = D (diverse2GL " 01-" . convertToProperUkrainianS) g {-# INLINE procDiverse2I #-} --- | Can be used to find out the minimum element.-procDiverse2Ineg-  :: (Ord c) => (Int16 -> c)-  -> FuncRep2 String Int16 c-procDiverse2Ineg g = D (negate . diverse2GL " 01-" . convertToProperUkrainianS) g-{-# INLINE procDiverse2Ineg #-}- procDiverse2F   :: (Ord c) => (Float -> c)   -> FuncRep2 String Float c procDiverse2F g = D (int2Float . fromEnum . diverse2GL " 01-" . convertToProperUkrainianS) g {-# INLINE procDiverse2F #-} -procDiverse2Fneg-  :: (Ord c) => (Float -> c)-  -> FuncRep2 String Float c-procDiverse2Fneg g = D (int2Float . negate . fromEnum . diverse2GL " 01-" . convertToProperUkrainianS) g-{-# INLINE procDiverse2Fneg #-}- --------------------------------------------------------------------------------------------  procRhythmicity23F@@ -94,15 +73,6 @@ procRhythmicity23F g choice coeffs = procRhythm23F g choice rhythmicity coeffs {-# INLINE procRhythmicity23F #-} --- | Can be used to find out the minimum element.-procRhythmicity23Fneg-  :: (Ord c) => (Float -> c)-  -> String-  -> Coeffs2-  -> FuncRep2 String Float c-procRhythmicity23Fneg g choice coeffs  = procRhythm23Fneg g choice rhythmicity coeffs-{-# INLINE procRhythmicity23Fneg #-}- procBothF   :: (Ord c) => (Float -> c)   -> Coeffs2@@ -110,14 +80,6 @@ procBothF g coeffs  = procB2F g S.syllableDurations coeffs {-# INLINE procBothF #-} --- | Can be used to find out the minimum element.-procBothFneg-  :: (Ord c) => (Float -> c)-  -> Coeffs2-  -> FuncRep2 String Float c-procBothFneg g coeffs  = procB2Fneg g S.syllableDurations coeffs-{-# INLINE procBothFneg #-}- procBothInvF   :: (Ord c) => (Float -> c)   -> Coeffs2@@ -125,14 +87,6 @@ procBothInvF g coeffs  = procB2InvF g S.syllableDurations coeffs {-# INLINE procBothInvF #-} --- | Can be used to find out the minimum element.-procBothInvFneg-  :: (Ord c) => (Float -> c)-  -> Coeffs2-  -> FuncRep2 String Float c-procBothInvFneg g coeffs  = procB2InvFneg g S.syllableDurations coeffs-{-# INLINE procBothInvFneg #-}- -------------------------------------------------------------------------------  procRhythmicity232F@@ -143,15 +97,6 @@ procRhythmicity232F g choice coeffs  = procRhythm23F g choice rhythmicity coeffs {-# INLINE procRhythmicity232F #-} --- | Can be used to find out the minimum element.-procRhythmicity232Fneg-  :: (Ord c) => (Float -> c)-  -> String-  -> Coeffs2-  -> FuncRep2 String Float c-procRhythmicity232Fneg g choice coeffs  = procRhythm23Fneg g choice rhythmicity coeffs-{-# INLINE procRhythmicity232Fneg #-}- procBoth2F   :: (Ord c) => (Float -> c)   -> Coeffs2@@ -159,14 +104,6 @@ procBoth2F g coeffs  = procB2F g S.syllableDurations2 coeffs {-# INLINE procBoth2F #-} --- | Can be used to find out the minimum element.-procBoth2Fneg-  :: (Ord c) => (Float -> c)-  -> Coeffs2-  -> FuncRep2 String Float c-procBoth2Fneg g coeffs  = procB2Fneg g S.syllableDurations2 coeffs-{-# INLINE procBoth2Fneg #-}- procBoth2InvF   :: (Ord c) => (Float -> c)   -> Coeffs2@@ -174,14 +111,6 @@ procBoth2InvF g coeffs  = procB2InvF g S.syllableDurations2 coeffs {-# INLINE procBoth2InvF #-} --- | Can be used to find out the minimum element.-procBoth2InvFneg-  :: (Ord c) => (Float -> c)-  -> Coeffs2-  -> FuncRep2 String Float c-procBoth2InvFneg g coeffs  = procB2InvFneg g S.syllableDurations2 coeffs-{-# INLINE procBoth2InvFneg #-}- -------------------------------------------------------------  eval23Coeffs :: Coeffs2 -> [Float] -> Float@@ -197,15 +126,6 @@ procRhythm23F h choice g coeffs = D (g choice coeffs) h {-# INLINE procRhythm23F #-} -procRhythm23Fneg-  :: (Ord c) => (Float -> c)-  -> String-  -> (String -> Coeffs2 -> String -> Float)-  -> Coeffs2-  -> FuncRep2 String Float c-procRhythm23Fneg h choice g coeffs = D (negate . g choice coeffs) h-{-# INLINE procRhythm23Fneg #-}- procB2F   :: (Ord c) => (Float -> c)   -> ([[[S.UZPP2]]] -> [[Float]])@@ -214,15 +134,6 @@ procB2F h g coeffs = D (\xs -> let ys = convertToProperUkrainianS . map (\x -> if x == '-' then ' ' else x) $ xs in  ((int2Float . fromEnum . diverse2GL " 01-" $ ys)*(eval23Coeffs coeffs . mconcat . g . map (S.divVwls . S.reSyllableCntnts . S.groupSnds . S.str2UZPP2s) . words1 . mapMaybe f $ ys))) h {-# INLINE procB2F #-} --- | Can be used to find out the minimum element.-procB2Fneg-  :: (Ord c) => (Float -> c)-  -> ([[[S.UZPP2]]] -> [[Float]])-  -> Coeffs2-  -> FuncRep2 String Float c-procB2Fneg h g coeffs = D (\xs -> let ys = convertToProperUkrainianS . map (\x -> if x == '-' then ' ' else x) $ xs in  ((int2Float . negate . fromEnum . diverse2GL " 01-" $ ys)*(eval23Coeffs coeffs . mconcat . g . map (S.divVwls . S.reSyllableCntnts . S.groupSnds . S.str2UZPP2s) . words1 . mapMaybe f $ ys))) h-{-# INLINE procB2Fneg #-}- procB2InvF   :: (Ord c) => (Float -> c)   -> ([[[S.UZPP2]]] -> [[Float]])@@ -234,20 +145,6 @@          S.str2UZPP2s) . words1 . mapMaybe f $ ys) ** 2.0         else  ((eval23Coeffs coeffs . mconcat . g . map (S.divVwls . S.reSyllableCntnts . S.groupSnds . S.str2UZPP2s) . words1 . mapMaybe f $ ys) / (int2Float . fromEnum $ z))) h {-# INLINE procB2InvF #-}---- | Can be used to find out the minimum element.-procB2InvFneg-  :: (Ord c) => (Float -> c)-  -> ([[[S.UZPP2]]] -> [[Float]])-  -> Coeffs2-  -> FuncRep2 String Float c-procB2InvFneg h g coeffs = D (\xs ->-  let !ys = convertToProperUkrainianS . map (\x -> if x == '-' then ' ' else x) $ xs-      !z = diverse2GL " 01-" ys in if z == 0 then  (negate (eval23Coeffs coeffs . mconcat . g . map (S.divVwls . S.reSyllableCntnts . S.groupSnds .-         S.str2UZPP2s) . words1 . mapMaybe f $ ys) ** 2.0)-        else  ((eval23Coeffs coeffs . mconcat . g . map (S.divVwls . S.reSyllableCntnts . S.groupSnds . S.str2UZPP2s) . words1 . mapMaybe f $ ys) /-          (int2Float . negate . fromEnum $ z))) h-{-# INLINE procB2InvFneg #-}  f x   | x == '0' = Nothing

@@ -2,7 +2,7 @@ -- For further documentation, see http://haskell.org/cabal/users-guide/  name:                phonetic-languages-simplified-properties-lists-version:             0.1.3.1+version:             0.2.0.0 synopsis:            A generalization of the uniqueness-periods-vector-properties package. description:         Is a simplified version of the functionality of the former one. Uses lists as main processment data. homepage:            https://hackage.haskell.org/package/phonetic-languages-simplified-properties-lists@@ -20,6 +20,6 @@   exposed-modules:     Phonetic.Languages.Lists.Ukrainian.PropertiesFuncRepG, Phonetic.Languages.Lists.Ukrainian.PropertiesSyllablesG   -- other-modules:   other-extensions:    BangPatterns, CPP-  build-depends:       base >=4.7 && <4.15, vector >=0.11 && <0.14, phonetic-languages-rhythmicity >=0.1.2 && <1, phonetic-languages-simplified-common >=0.3 && <1, ukrainian-phonetics-basic >=0.3.1.2 && <1+  build-depends:       base >=4.8 && <4.15, vector >=0.11 && <0.14, phonetic-languages-rhythmicity >=0.1.2 && <1, phonetic-languages-simplified-common >=0.3.2 && <1, ukrainian-phonetics-basic >=0.3.1.2 && <1   -- hs-source-dirs:   default-language:    Haskell2010