phonetic-languages-simplified-generalized-examples-array 0.6.1.0 → 0.6.2.0
raw patch · 3 files changed
+37/−183 lines, 3 filesdep ~phonetic-languages-simplified-generalized-properties-arrayPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: phonetic-languages-simplified-generalized-properties-array
API changes (from Hackage documentation)
Files
- ChangeLog.md +6/−0
- Phonetic/Languages/Simplified/Array/General/FuncRep2RelatedG2.hs +29/−181
- phonetic-languages-simplified-generalized-examples-array.cabal +2/−2
ChangeLog.md view
@@ -75,3 +75,9 @@ * Sixth version revised A. Fixed issues with the fixed point of 1.0 (arising from the issue in the dependency package phonetic-languages-rhythmicity).++## 0.6.2.0 -- 2021-07-31++* Sixth version revised B. Changed the dependency boundaries so that the issues are fixed with '0' and not '0' functions. +Some code improvements (reduced duplication). +
Phonetic/Languages/Simplified/Array/General/FuncRep2RelatedG2.hs view
@@ -77,187 +77,35 @@ -> FuncRep2 String Double c chooseMaxG k wrs ks arr gs us vs g h coeffs xs choice | take 1 choice == "c" = procRhythmicity23F k g h choice coeffs wrs ks arr gs us vs- | otherwise = getBFstL' (procB2InvF wrs ks arr gs us vs g (xs !! 3) coeffs)- [("02y",procRhythmicity23F k g h "02y" coeffs wrs ks arr gs us vs),- ("02z",procRhythmicity23F k g h "02z" coeffs wrs ks arr gs us vs),- ("03y",procRhythmicity23F k g h "03y" coeffs wrs ks arr gs us vs),- ("03z",procRhythmicity23F k g h "03z" coeffs wrs ks arr gs us vs),- ("04y",procRhythmicity23F k g h "04y" coeffs wrs ks arr gs us vs),- ("04z",procRhythmicity23F k g h "04z" coeffs wrs ks arr gs us vs),- ("0y",procRhythmicity23F k g h "0y" coeffs wrs ks arr gs us vs),- ("0z",procRhythmicity23F k g h "0z" coeffs wrs ks arr gs us vs),- ("s01",procRhythmicity23F k g h "s01" coeffs wrs ks arr gs us vs),- ("s02",procRhythmicity23F k g h "s02" coeffs wrs ks arr gs us vs),- ("s03",procRhythmicity23F k g h "s03" coeffs wrs ks arr gs us vs),- ("s04",procRhythmicity23F k g h "s04" coeffs wrs ks arr gs us vs),- ("s11",procRhythmicity23F k g h "s11" coeffs wrs ks arr gs us vs),- ("s12",procRhythmicity23F k g h "s12" coeffs wrs ks arr gs us vs),- ("s13",procRhythmicity23F k g h "s13" coeffs wrs ks arr gs us vs),- ("s14",procRhythmicity23F k g h "s14" coeffs wrs ks arr gs us vs),- ("s21",procRhythmicity23F k g h "s21" coeffs wrs ks arr gs us vs),- ("s22",procRhythmicity23F k g h "s22" coeffs wrs ks arr gs us vs),- ("s23",procRhythmicity23F k g h "s23" coeffs wrs ks arr gs us vs),- ("s24",procRhythmicity23F k g h "s24" coeffs wrs ks arr gs us vs),- ("s31",procRhythmicity23F k g h "s31" coeffs wrs ks arr gs us vs),- ("s32",procRhythmicity23F k g h "s32" coeffs wrs ks arr gs us vs),- ("s33",procRhythmicity23F k g h "s33" coeffs wrs ks arr gs us vs),- ("s34",procRhythmicity23F k g h "s34" coeffs wrs ks arr gs us vs),- ("s41",procRhythmicity23F k g h "s41" coeffs wrs ks arr gs us vs),- ("s42",procRhythmicity23F k g h "s42" coeffs wrs ks arr gs us vs),- ("s43",procRhythmicity23F k g h "s43" coeffs wrs ks arr gs us vs),- ("s44",procRhythmicity23F k g h "s44" coeffs wrs ks arr gs us vs),- ("s51",procRhythmicity23F k g h "s51" coeffs wrs ks arr gs us vs),- ("s52",procRhythmicity23F k g h "s52" coeffs wrs ks arr gs us vs),- ("s53",procRhythmicity23F k g h "s53" coeffs wrs ks arr gs us vs),- ("s54",procRhythmicity23F k g h "s54" coeffs wrs ks arr gs us vs),- ("s61",procRhythmicity23F k g h "s61" coeffs wrs ks arr gs us vs),- ("s62",procRhythmicity23F k g h "s62" coeffs wrs ks arr gs us vs),- ("s63",procRhythmicity23F k g h "s63" coeffs wrs ks arr gs us vs),- ("s64",procRhythmicity23F k g h "s64" coeffs wrs ks arr gs us vs),- ("s71",procRhythmicity23F k g h "s71" coeffs wrs ks arr gs us vs),- ("s72",procRhythmicity23F k g h "s73" coeffs wrs ks arr gs us vs),- ("s74",procRhythmicity23F k g h "s74" coeffs wrs ks arr gs us vs),- ("t01",procRhythmicity23F k g h "t01" coeffs wrs ks arr gs us vs),- ("t02",procRhythmicity23F k g h "t02" coeffs wrs ks arr gs us vs),- ("t03",procRhythmicity23F k g h "t03" coeffs wrs ks arr gs us vs),- ("t04",procRhythmicity23F k g h "t04" coeffs wrs ks arr gs us vs),- ("t11",procRhythmicity23F k g h "t11" coeffs wrs ks arr gs us vs),- ("t12",procRhythmicity23F k g h "t12" coeffs wrs ks arr gs us vs),- ("t13",procRhythmicity23F k g h "t13" coeffs wrs ks arr gs us vs),- ("t14",procRhythmicity23F k g h "t14" coeffs wrs ks arr gs us vs),- ("t21",procRhythmicity23F k g h "t21" coeffs wrs ks arr gs us vs),- ("t22",procRhythmicity23F k g h "t22" coeffs wrs ks arr gs us vs),- ("t23",procRhythmicity23F k g h "t23" coeffs wrs ks arr gs us vs),- ("t24",procRhythmicity23F k g h "t24" coeffs wrs ks arr gs us vs),- ("t31",procRhythmicity23F k g h "t31" coeffs wrs ks arr gs us vs),- ("t32",procRhythmicity23F k g h "t32" coeffs wrs ks arr gs us vs),- ("t33",procRhythmicity23F k g h "t33" coeffs wrs ks arr gs us vs),- ("t34",procRhythmicity23F k g h "t34" coeffs wrs ks arr gs us vs),- ("t41",procRhythmicity23F k g h "t41" coeffs wrs ks arr gs us vs),- ("t42",procRhythmicity23F k g h "t42" coeffs wrs ks arr gs us vs),- ("t43",procRhythmicity23F k g h "t43" coeffs wrs ks arr gs us vs),- ("t44",procRhythmicity23F k g h "t44" coeffs wrs ks arr gs us vs),- ("t51",procRhythmicity23F k g h "t51" coeffs wrs ks arr gs us vs),- ("t52",procRhythmicity23F k g h "t52" coeffs wrs ks arr gs us vs),- ("t53",procRhythmicity23F k g h "t53" coeffs wrs ks arr gs us vs),- ("t54",procRhythmicity23F k g h "t54" coeffs wrs ks arr gs us vs),- ("t61",procRhythmicity23F k g h "t61" coeffs wrs ks arr gs us vs),- ("t62",procRhythmicity23F k g h "t62" coeffs wrs ks arr gs us vs),- ("t63",procRhythmicity23F k g h "t63" coeffs wrs ks arr gs us vs),- ("t64",procRhythmicity23F k g h "t64" coeffs wrs ks arr gs us vs),- ("t71",procRhythmicity23F k g h "t71" coeffs wrs ks arr gs us vs),- ("t72",procRhythmicity23F k g h "t73" coeffs wrs ks arr gs us vs),- ("t74",procRhythmicity23F k g h "t74" coeffs wrs ks arr gs us vs),- ("u01",procRhythmicity23F k g h "u01" coeffs wrs ks arr gs us vs),- ("u02",procRhythmicity23F k g h "u02" coeffs wrs ks arr gs us vs),- ("u03",procRhythmicity23F k g h "u03" coeffs wrs ks arr gs us vs),- ("u04",procRhythmicity23F k g h "u04" coeffs wrs ks arr gs us vs),- ("u11",procRhythmicity23F k g h "u11" coeffs wrs ks arr gs us vs),- ("u12",procRhythmicity23F k g h "u12" coeffs wrs ks arr gs us vs),- ("u13",procRhythmicity23F k g h "u13" coeffs wrs ks arr gs us vs),- ("u14",procRhythmicity23F k g h "u14" coeffs wrs ks arr gs us vs),- ("u21",procRhythmicity23F k g h "u21" coeffs wrs ks arr gs us vs),- ("u22",procRhythmicity23F k g h "u22" coeffs wrs ks arr gs us vs),- ("u23",procRhythmicity23F k g h "u23" coeffs wrs ks arr gs us vs),- ("u24",procRhythmicity23F k g h "u24" coeffs wrs ks arr gs us vs),- ("u31",procRhythmicity23F k g h "u31" coeffs wrs ks arr gs us vs),- ("u32",procRhythmicity23F k g h "u32" coeffs wrs ks arr gs us vs),- ("u33",procRhythmicity23F k g h "u33" coeffs wrs ks arr gs us vs),- ("u34",procRhythmicity23F k g h "u34" coeffs wrs ks arr gs us vs),- ("u41",procRhythmicity23F k g h "u41" coeffs wrs ks arr gs us vs),- ("u42",procRhythmicity23F k g h "u42" coeffs wrs ks arr gs us vs),- ("u43",procRhythmicity23F k g h "u43" coeffs wrs ks arr gs us vs),- ("u44",procRhythmicity23F k g h "u44" coeffs wrs ks arr gs us vs),- ("u51",procRhythmicity23F k g h "u51" coeffs wrs ks arr gs us vs),- ("u52",procRhythmicity23F k g h "u52" coeffs wrs ks arr gs us vs),- ("u53",procRhythmicity23F k g h "u53" coeffs wrs ks arr gs us vs),- ("u54",procRhythmicity23F k g h "u54" coeffs wrs ks arr gs us vs),- ("u61",procRhythmicity23F k g h "u61" coeffs wrs ks arr gs us vs),- ("u62",procRhythmicity23F k g h "u62" coeffs wrs ks arr gs us vs),- ("u63",procRhythmicity23F k g h "u63" coeffs wrs ks arr gs us vs),- ("u64",procRhythmicity23F k g h "u64" coeffs wrs ks arr gs us vs),- ("u71",procRhythmicity23F k g h "u71" coeffs wrs ks arr gs us vs),- ("u72",procRhythmicity23F k g h "u73" coeffs wrs ks arr gs us vs),- ("u74",procRhythmicity23F k g h "u74" coeffs wrs ks arr gs us vs),- ("v01",procRhythmicity23F k g h "v01" coeffs wrs ks arr gs us vs),- ("v02",procRhythmicity23F k g h "v02" coeffs wrs ks arr gs us vs),- ("v03",procRhythmicity23F k g h "v03" coeffs wrs ks arr gs us vs),- ("v04",procRhythmicity23F k g h "v04" coeffs wrs ks arr gs us vs),- ("v11",procRhythmicity23F k g h "v11" coeffs wrs ks arr gs us vs),- ("v12",procRhythmicity23F k g h "v12" coeffs wrs ks arr gs us vs),- ("v13",procRhythmicity23F k g h "v13" coeffs wrs ks arr gs us vs),- ("v14",procRhythmicity23F k g h "v14" coeffs wrs ks arr gs us vs),- ("v21",procRhythmicity23F k g h "v21" coeffs wrs ks arr gs us vs),- ("v22",procRhythmicity23F k g h "v22" coeffs wrs ks arr gs us vs),- ("v23",procRhythmicity23F k g h "v23" coeffs wrs ks arr gs us vs),- ("v24",procRhythmicity23F k g h "v24" coeffs wrs ks arr gs us vs),- ("v31",procRhythmicity23F k g h "v31" coeffs wrs ks arr gs us vs),- ("v32",procRhythmicity23F k g h "v32" coeffs wrs ks arr gs us vs),- ("v33",procRhythmicity23F k g h "v33" coeffs wrs ks arr gs us vs),- ("v34",procRhythmicity23F k g h "v34" coeffs wrs ks arr gs us vs),- ("v41",procRhythmicity23F k g h "v41" coeffs wrs ks arr gs us vs),- ("v42",procRhythmicity23F k g h "v42" coeffs wrs ks arr gs us vs),- ("v43",procRhythmicity23F k g h "v43" coeffs wrs ks arr gs us vs),- ("v44",procRhythmicity23F k g h "v44" coeffs wrs ks arr gs us vs),- ("v51",procRhythmicity23F k g h "v51" coeffs wrs ks arr gs us vs),- ("v52",procRhythmicity23F k g h "v52" coeffs wrs ks arr gs us vs),- ("v53",procRhythmicity23F k g h "v53" coeffs wrs ks arr gs us vs),- ("v54",procRhythmicity23F k g h "v54" coeffs wrs ks arr gs us vs),- ("v61",procRhythmicity23F k g h "v61" coeffs wrs ks arr gs us vs),- ("v62",procRhythmicity23F k g h "v62" coeffs wrs ks arr gs us vs),- ("v63",procRhythmicity23F k g h "v63" coeffs wrs ks arr gs us vs),- ("v64",procRhythmicity23F k g h "v64" coeffs wrs ks arr gs us vs),- ("v71",procRhythmicity23F k g h "v71" coeffs wrs ks arr gs us vs),- ("v72",procRhythmicity23F k g h "v73" coeffs wrs ks arr gs us vs),- ("v74",procRhythmicity23F k g h "v74" coeffs wrs ks arr gs us vs),- ("w01",procRhythmicity23F k g h "w01" coeffs wrs ks arr gs us vs),- ("w02",procRhythmicity23F k g h "w02" coeffs wrs ks arr gs us vs),- ("w03",procRhythmicity23F k g h "w03" coeffs wrs ks arr gs us vs),- ("w04",procRhythmicity23F k g h "w04" coeffs wrs ks arr gs us vs),- ("w11",procRhythmicity23F k g h "w11" coeffs wrs ks arr gs us vs),- ("w12",procRhythmicity23F k g h "w12" coeffs wrs ks arr gs us vs),- ("w13",procRhythmicity23F k g h "w13" coeffs wrs ks arr gs us vs),- ("w14",procRhythmicity23F k g h "w14" coeffs wrs ks arr gs us vs),- ("w21",procRhythmicity23F k g h "w21" coeffs wrs ks arr gs us vs),- ("w22",procRhythmicity23F k g h "w22" coeffs wrs ks arr gs us vs),- ("w23",procRhythmicity23F k g h "w23" coeffs wrs ks arr gs us vs),- ("w24",procRhythmicity23F k g h "w24" coeffs wrs ks arr gs us vs),- ("w31",procRhythmicity23F k g h "w31" coeffs wrs ks arr gs us vs),- ("w32",procRhythmicity23F k g h "w32" coeffs wrs ks arr gs us vs),- ("w33",procRhythmicity23F k g h "w33" coeffs wrs ks arr gs us vs),- ("w34",procRhythmicity23F k g h "w34" coeffs wrs ks arr gs us vs),- ("x01",procRhythmicity23F k g h "x01" coeffs wrs ks arr gs us vs),- ("x02",procRhythmicity23F k g h "x02" coeffs wrs ks arr gs us vs),- ("x03",procRhythmicity23F k g h "x03" coeffs wrs ks arr gs us vs),- ("x04",procRhythmicity23F k g h "x04" coeffs wrs ks arr gs us vs),- ("x11",procRhythmicity23F k g h "x11" coeffs wrs ks arr gs us vs),- ("x12",procRhythmicity23F k g h "x12" coeffs wrs ks arr gs us vs),- ("x13",procRhythmicity23F k g h "x13" coeffs wrs ks arr gs us vs),- ("x14",procRhythmicity23F k g h "x14" coeffs wrs ks arr gs us vs),- ("x21",procRhythmicity23F k g h "x21" coeffs wrs ks arr gs us vs),- ("x22",procRhythmicity23F k g h "x22" coeffs wrs ks arr gs us vs),- ("x23",procRhythmicity23F k g h "x23" coeffs wrs ks arr gs us vs),- ("x24",procRhythmicity23F k g h "x24" coeffs wrs ks arr gs us vs),- ("x31",procRhythmicity23F k g h "x31" coeffs wrs ks arr gs us vs),- ("x32",procRhythmicity23F k g h "x32" coeffs wrs ks arr gs us vs),- ("x33",procRhythmicity23F k g h "x33" coeffs wrs ks arr gs us vs),- ("x34",procRhythmicity23F k g h "x34" coeffs wrs ks arr gs us vs),- ("y",procB2F wrs ks arr gs us vs g (xs !! 0) coeffs),- ("y0",procDiverse2F wrs (' ':us `mappend` vs) g),- ("y2",procB2F wrs ks arr gs us vs g (xs !! 1) coeffs),- ("y3",procB2F wrs ks arr gs us vs g (xs !! 2) coeffs),- ("y4",procB2F wrs ks arr gs us vs g (xs !! 3) coeffs),- ("yy",procB2InvF wrs ks arr gs us vs g (xs !! 0) coeffs),- ("yy2",procB2InvF wrs ks arr gs us vs g (xs !! 1) coeffs),- ("yy3",procB2InvF wrs ks arr gs us vs g (xs !! 2) coeffs),- ("z",procB2FF wrs ks arr gs us vs k g (xs !! 0) coeffs),- ("z2",procB2FF wrs ks arr gs us vs k g (xs !! 1) coeffs),- ("z3",procB2FF wrs ks arr gs us vs k g (xs !! 2) coeffs),- ("z4",procB2FF wrs ks arr gs us vs k g (xs !! 3) coeffs),- ("zz",procB2InvFF wrs ks arr gs us vs k g (xs !! 0) coeffs),- ("zz2",procB2InvFF wrs ks arr gs us vs k g (xs !! 1) coeffs),- ("zz3",procB2InvFF wrs ks arr gs us vs k g (xs !! 2) coeffs),- ("zz4", procB2InvFF wrs ks arr gs us vs k g (xs !! 3) coeffs)] choice + | getBFstL' False (zip ["02y","02z","03y","03z","04y","04z","0y","0z","s01","s02","s03","s04",+ "s11","s12","s13","s14","s21","s22","s23","s24","s31","s32","s33","s34","s41","s42","s43","s44",+ "s51","s52","s53","s54","s61","s62","s63","s64","s71","s72","s74","t01","t02","t03","t04","t11",+ "t12","t13","t14","t21","t22","t23","t24","t31","t32","t33","t34","t41","t42","t43","t44","t51",+ "t52","t53","t54","t61","t62","t63","t64","t71","t72","t74","u01","u02","u03","u04","u11","u12",+ "u13","u14","u21","u22","u23","u24","u31","u32","u33","u34","u41","u42","u43","u44","u51","u52",+ "u53","u54","u61","u62","u63","u64","u71","u72","u74","v01","v02","v03","v04","v11","v12","v13",+ "v14","v21","v22","v23","v24","v31","v32","v33","v34","v41","v42","v43","v44","v51","v52","v53",+ "v54","v61","v62","v63","v64","v71","v72","v74","w01","w02","w03","w04","w11","w12","w13","w14",+ "w21","w22","w23","w24","w31","w32","w33","w34","x01","x02","x03","x04","x11","x12","x13","x14",+ "x21","x22","x23","x24","x31","x32","x33","x34"] . replicate 1000 $ True) choice =+ procRhythmicity23F k g h choice coeffs wrs ks arr gs us vs+ | otherwise = getBFstL' (procB2F wrs ks arr gs us vs g (xs !! 0) coeffs)+ [("y",procB2F wrs ks arr gs us vs g (xs !! 0) coeffs),+ ("y0",procDiverse2F wrs (' ':us `mappend` vs) g),+ ("y2",procB2F wrs ks arr gs us vs g (xs !! 1) coeffs),+ ("y3",procB2F wrs ks arr gs us vs g (xs !! 2) coeffs),+ ("y4",procB2F wrs ks arr gs us vs g (xs !! 3) coeffs),+ ("yy",procB2InvF wrs ks arr gs us vs g (xs !! 0) coeffs),+ ("yy2",procB2InvF wrs ks arr gs us vs g (xs !! 1) coeffs),+ ("yy3",procB2InvF wrs ks arr gs us vs g (xs !! 2) coeffs),+ ("z",procB2FF wrs ks arr gs us vs k g (xs !! 0) coeffs),+ ("z2",procB2FF wrs ks arr gs us vs k g (xs !! 1) coeffs),+ ("z3",procB2FF wrs ks arr gs us vs k g (xs !! 2) coeffs),+ ("z4",procB2FF wrs ks arr gs us vs k g (xs !! 3) coeffs),+ ("zz",procB2InvFF wrs ks arr gs us vs k g (xs !! 0) coeffs),+ ("zz2",procB2InvFF wrs ks arr gs us vs k g (xs !! 1) coeffs),+ ("zz3",procB2InvFF wrs ks arr gs us vs k g (xs !! 2) coeffs),+ ("zz4", procB2InvFF wrs ks arr gs us vs k g (xs !! 3) coeffs)] choice -- | Allows to choose precision in the Numeric.showFDouble function being given a choice parameter. precChoice
phonetic-languages-simplified-generalized-examples-array.cabal view
@@ -3,7 +3,7 @@ -- http://haskell.org/cabal/users-guide/ name: phonetic-languages-simplified-generalized-examples-array-version: 0.6.1.0+version: 0.6.2.0 synopsis: Helps to create texts with the given phonetic properties (e. g. poetic). description: Is rewritten from the modules of the @phonetic-languages-simplified-examples-array@ package. Can be used not only for Ukrainian, but also for other languages. homepage: https://hackage.haskell.org/package/phonetic-languages-simplified-generalized-examples-array@@ -21,6 +21,6 @@ exposed-modules: Phonetic.Languages.General.Lines, Phonetic.Languages.General.Parsing, Phonetic.Languages.General.Simple, Phonetic.Languages.General.GetTextualInfo, Phonetic.Languages.Simplified.Array.General.FuncRep2RelatedG2, Phonetic.Languages.General.Simple.Parsing, Phonetic.Languages.General.Lines.Parsing, Phonetic.Languages.General.GetInfo.Parsing, EspeakNG_IPA -- other-modules: other-extensions: BangPatterns, FlexibleContexts- build-depends: base >=4.8 && <4.15, phonetic-languages-simplified-generalized-examples-common >=0.2 && <1, subG >=0.4.2 && <1, phonetic-languages-simplified-generalized-properties-array >=0.4.1 && <1, phonetic-languages-simplified-base >=0.2 && <1, phonetic-languages-permutations-array >=0.1 && <1, phonetic-languages-filters-array >=0.1 && <1, phonetic-languages-phonetics-basics >=0.8.1 && <1, phonetic-languages-constraints-array >=0.1 && <1, parallel >=3.2.0.6 && <4, phonetic-languages-plus >=0.2 && <1, mmsyn2-array >=0.1.3 && <1, heaps >=0.3.6.1 && <1, mmsyn3 >=0.1.5 && <1, process >= 1.6.2 && <2+ build-depends: base >=4.8 && <4.15, phonetic-languages-simplified-generalized-examples-common >=0.2 && <1, subG >=0.4.2 && <1, phonetic-languages-simplified-generalized-properties-array >=0.4.2 && <1, phonetic-languages-simplified-base >=0.2 && <1, phonetic-languages-permutations-array >=0.1 && <1, phonetic-languages-filters-array >=0.1 && <1, phonetic-languages-phonetics-basics >=0.8.1 && <1, phonetic-languages-constraints-array >=0.1 && <1, parallel >=3.2.0.6 && <4, phonetic-languages-plus >=0.2 && <1, mmsyn2-array >=0.1.3 && <1, heaps >=0.3.6.1 && <1, mmsyn3 >=0.1.5 && <1, process >= 1.6.2 && <2 -- hs-source-dirs: default-language: Haskell2010