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

raw patch · 4 files changed

+52/−16 lines, 4 filesdep ~ukrainian-phonetics-basicPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: ukrainian-phonetics-basic

API changes (from Hackage documentation)

Files

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

@@ -25,3 +25,7 @@  * Second version. Removed the unnecessary neg functions. Dependencies boundaries changes. +## 0.3.0.0 -- 2020-12-03++* Third version. Added new properties related to the new uzpp2Durat3 function from the ukrainian-phonetics-basic package.+Removed the duplicated function procRhythmicity232F (== procRhythmicity23F).

@@ -16,13 +16,16 @@   procDiverse2I   -- * Functions with 'Float'   , procDiverse2F-  , procRhythmicity23F   , procBothF   , procBothInvF   -- ** Working with generated by r-glpk-phonetic-languages-ukrainian-durations syllable durations-  , procRhythmicity232F   , procBoth2F   , procBoth2InvF+  -- ** NEW Working with generated by r-glpk-phonetic-languages-ukrainian-durations syllable durations+  , procBoth3F+  , procBoth3InvF+  -- * Working with rhythmicity+  , procRhythmicity23F ) where  #ifdef __GLASGOW_HASKELL__@@ -89,14 +92,6 @@  ------------------------------------------------------------------------------- -procRhythmicity232F-  :: (Ord c) => (Float -> c)-  -> String-  -> Coeffs2-  -> FuncRep2 String Float c-procRhythmicity232F g choice coeffs  = procRhythm23F g choice rhythmicity coeffs-{-# INLINE procRhythmicity232F #-}- procBoth2F   :: (Ord c) => (Float -> c)   -> Coeffs2@@ -145,6 +140,24 @@          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 #-}++---------------------------------------------------------------------++procBoth3F+  :: (Ord c) => (Float -> c)+  -> Coeffs2+  -> FuncRep2 String Float c+procBoth3F g coeffs  = procB2F g S.syllableDurations3 coeffs+{-# INLINE procBoth3F #-}++procBoth3InvF+  :: (Ord c) => (Float -> c)+  -> Coeffs2+  -> FuncRep2 String Float c+procBoth3InvF g coeffs  = procB2InvF g S.syllableDurations3 coeffs+{-# INLINE procBoth3InvF #-}++-------------------------------------------------------------  f x   | x == '0' = Nothing

@@ -21,15 +21,20 @@   , sndCF   , readCF   -- * Rhythmicity metrices (semi-empirical)-  -- ** Simple ones+  -- ** Simple one   , rhythmicity0   -- ** With weight coefficients   , rhythmicityK   -- * Rhythmicity metrices from generated with r-glpk-phonetic-languages-ukrainian-durations package (since 0.2.0.0 version)-  -- ** Simple ones+  -- ** Simple one   , rhythmicity02   -- ** With weight coefficients   , rhythmicityK2+  -- * NEW Rhythmicity metrices from generated with r-glpk-phonetic-languages-ukrainian-durations package (since 0.2.0.0 version)+  -- ** Simple one+  , rhythmicity03+  -- ** With weight coefficients+  , rhythmicityK3   -- * General   , rhythmicity ) where@@ -109,12 +114,26 @@  | null xs = 0.0  | otherwise = eval23K k2 k3 . syllableDurations2 . createSyllablesUkrP $ xs +-------------------------------------------------------++rhythmicity03 :: String -> Float+rhythmicity03 xs+ | null xs = 0.0+ | otherwise = eval23 . syllableDurations3 . createSyllablesUkr $ xs++rhythmicityK3 :: Float -> Float -> String -> Float+rhythmicityK3 k2 k3 xs+ | null xs = 0.0+ | otherwise = eval23K k2 k3 . syllableDurations3 . createSyllablesUkrP $ xs+ ------------------------------------------------------------------  rhythmicity :: String -> Coeffs2 -> String -> Float rhythmicity choice CF0   | choice == "0y" = rhythmicity0-  | otherwise = rhythmicity02+  | choice == "02y" = rhythmicity02+  | otherwise = rhythmicity03 rhythmicity choice (CF2 x y)   | choice == "0y" = rhythmicityK (fromMaybe 1.0 x) (fromMaybe 1.0 y)-  | otherwise = rhythmicityK2 (fromMaybe 1.0 x) (fromMaybe 1.0 y)+  | choice == "02y" = rhythmicityK2 (fromMaybe 1.0 x) (fromMaybe 1.0 y)+  | otherwise = rhythmicityK3 (fromMaybe 1.0 x) (fromMaybe 1.0 y)

@@ -2,7 +2,7 @@ -- For further documentation, see http://haskell.org/cabal/users-guide/  name:                phonetic-languages-simplified-properties-lists-version:             0.2.0.0+version:             0.3.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.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+  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.2 && <1   -- hs-source-dirs:   default-language:    Haskell2010