phonetic-languages-rhythmicity 0.3.1.0 → 0.3.2.0
raw patch · 3 files changed
+15/−10 lines, 3 filesPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
Files
- CHANGELOG.md +5/−0
- Rhythmicity/TwoFourth.hs +9/−9
- phonetic-languages-rhythmicity.cabal +1/−1
CHANGELOG.md view
@@ -29,3 +29,8 @@ ## 0.3.1.0 -- 2021-07-20 * Third version revised A. Added new functions to the module Rhythmicity.TwoFourth. Some code optimizations.++## 0.3.2.0 -- 2021-07-20++* Third version revised B. Some changes to the code and documentation in the Rhythmicity.TwoFourth module.+
Rhythmicity/TwoFourth.hs view
@@ -46,9 +46,9 @@ {-| The predicate to check whether the two given arguments can be used together to get meaningful results. -} validChRhPair :: Choices -> RhythmBasis -> Bool-validChRhPair (Ch _ _ n) (Rhythm p q l)+validChRhPair (Ch x y n) (Rhythm p q l) | p < 0 || q < 0 || l < 0 = False- | n > 1 = n == p + q + l+ | n > 1 = if n == p + q + l then n >= x + y else False | otherwise = False {-| The value for the 'Choices' with the two maximum highlighted values and two other ones in the 4-element period.@@ -121,7 +121,7 @@ -> [Marker3s] -> [Marker3s] -> Double -- ^ In case of positive previous 'Double' arguments this is a positive value. The greater one corresponds to (probably) more rhythmic list.-similarityLogics x0 k1 k2 (x:xs) (y:ys) = similarityLogics (similarityF1 x y x0 k1 k2) k1 k2 xs ys+similarityLogics x0 k1 k2 (x:xs) (y:ys) = similarityLogics (similarityF1 x y k1 k2 x0) k1 k2 xs ys similarityLogics x0 _ _ _ _ = x0 {-| The more straightforward variant of the 'similarityLogics' function. -}@@ -132,17 +132,17 @@ -> [Marker3s] -> [Marker3s] -> Double -- ^ In case of positive previous 'Double' arguments this is a positive value. The greater one corresponds to (probably) more rhythmic list.-similarityLogics0 x0 k1 k2 (x:xs) (y:ys) = similarityLogics0 (similarityF0 x y x0 k1 k2) k1 k2 xs ys+similarityLogics0 x0 k1 k2 (x:xs) (y:ys) = similarityLogics0 (similarityF0 x y k1 k2 x0) k1 k2 xs ys similarityLogics0 x0 _ _ _ _ = x0 similarityF1 :: Marker3s -> Marker3s- -> Double -- ^ The initial value. -> Double -- ^ The positive factor (multiplier) coefficient that increases or decreases the result in case of 'A' simultaneous presence (absence). -> Double -- ^ The addition (positive subtraction) coefficient that increases or decreases (probably) the result in case of 'B' similtaneous presence (absence).+ -> Double -- ^ The initial value. -> Double-similarityF1 m1 m2 x0 k1 k2+similarityF1 m1 m2 k1 k2 x0 | m1 == m2 = case m1 of A -> x0 * k1 B -> x0 + k2@@ -156,11 +156,11 @@ similarityF0 :: Marker3s -> Marker3s- -> Double -- ^ The initial value. -> Double -- ^ The positive factor (multiplier) coefficient that increases or decreases the result in case of 'A' simultaneous presence (absence).- -> Double -- ^ The addition (positive subtraction) coefficient that increases the result in case of 'B' similtaneous presence.+ -> Double -- ^ The addition coefficient that increases the result in case of 'B' similtaneous presence.+ -> Double -- ^ The initial value. -> Double-similarityF0 m1 m2 x0 k1 k2+similarityF0 m1 m2 k1 k2 x0 | m1 == m2 = case m1 of A -> x0 * k1 B -> x0 + k2
phonetic-languages-rhythmicity.cabal view
@@ -2,7 +2,7 @@ -- For further documentation, see http://haskell.org/cabal/users-guide/ name: phonetic-languages-rhythmicity-version: 0.3.1.0+version: 0.3.2.0 synopsis: Allows to estimate the rhythmicity properties for the text (usually, the Ukrainian poetic one) description: Allows to estimate (somewhat to say, evaluate) the rhythmicity properties for the text (usually, the Ukrainian poetic one, but it can be extrapolated to other ones). Inspired by the ancient Greek and Latin poetry.