diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -179,3 +179,9 @@ * Thirteenth version revised A. Fixed issue with output with 'white-spaced' halflines. Updated the dependency boundaries of halfsplit. +## 0.13.2.0 -- 2023-11-12 + +* Thirteenth version revised B. Added possibility to specify for +l2 ... -l2 group of arguments + additionally a power of 10 for the multiplier that affects the value and groupping. Use for this ++q with Int number as the next command line argument in the range [2..6]. The default value is 4. + diff --git a/Main.hs b/Main.hs --- a/Main.hs +++ b/Main.hs @@ -42,6 +42,10 @@ maxNumWords = let k = fromMaybe 7 (readMaybe (concat . getB "+x" $ argsB)::Maybe Int) in if k == 0 || abs k >= 9 then 9 else max (abs k) 2 hc = readHashCorrections . concat . getB "+c" $ argsB dcspecs = getB "+dc" argsB + power10' = fromMaybe 4 (readMaybe (concat . getB "+q" $ argsB)::Maybe Int) + power10 + | power10' < 2 && power10' > 6 = 4 + | otherwise = power10' (html,dcfile) | null dcspecs = (False, "") | otherwise = (head dcspecs == "1",last dcspecs) @@ -106,8 +110,17 @@ if helpMessage then do putStrLn "SYNOPSIS:" putStrLn "" - putStrLn "phladiprelioUkr [+a -a] [+b -b] [+c ] [+n] [+l] [+d ] [+k ] [+ul ] [+r ] [-t [-C +RTS -N -RTS]] [+s ] [-p] [+w ] [+f ] [+x ] [+dc tag at the end of each line for two-column output> [+l2 -l2]] " + putStrLn "phladiprelioUkr [[+a -a] [+b -b] [+c ] [+n] [+l] [+d ] [+k ] [+r ] [+s ] [-p] [+w ] [+f ] [+x ] [+dc tag at the end of each line for two-column output> ]] " putStrLn "" + putStrLn "OR:" + putStrLn "phladiprelioUkr [[+a -a] [+b -b] [+c ] [+n] [+l] [+d ] [+k ] [-t [-C +RTS -N -RTS]] [+s ] [-p] [+w ] [+x ]] " + putStrLn "" + putStrLn "OR:" + putStrLn "phladiprelioUkr [[+a -a] [+b -b] [+ul ] [+n] [+l] [-p] [+w ] [+f ] [+x ] [+dc tag at the end of each line for two-column output> ]] " + putStrLn "" + putStrLn "OR:" + putStrLn "phladiprelioUkr [[+a -a] [+b -b] [+n] [+l] [+d ] [+s ] [-p] [+w ] [+q ] [+f ] [+x ] [+dc tag at the end of each line for two-column output> ] [+l2 -l2]] " + putStrLn "" putStrLn "+n \t— if specified then the order of sorting and printing is descending (the reverse one to the default otherwise). " putStrLn "" putStrLn "+l \t— if specified then the output for one property (no tests) contains empty lines between the groups of the line option with the same value of property. " @@ -136,6 +149,8 @@ putStrLn "" putStrLn "+l2 ... -l2 \t— if present and has inside Ukrainian text then the line options are compared with it using the idea of lists similarity. The greater values correspond to the less similar and more different lines. Has no effect with +dc group of command line arguments. Has presedence over +t, +r, +k, +c etc. groups of command line options so that these latter ones have no effect when +l2 ... -l2 is present." putStrLn "" + putStrLn "+q \t— if present with +l2 ... -l2 group of arguments then the next argument is a power of 10 which the distance between line option and the predefined line is multiplied by. The default one is 4 (that means it is multiplied by 10000 and the value has usually 4 digits. You can specify not less than 2 and not greater than 6. Otherwise, these limit numbers are used instead. The less value here leads to more groupped options output." + putStrLn "" putStrLn "+ul \t— afterwards there is a string that encodes which sounds are used for diversity property evaluation. If used, then +r group has no meaning and is not used. Unlike in the link, the argument \"1\" means computing the property for all the sound representations included (for all of the present representations, so the value is maximal between all other strings instead of \"1\"). For more information, see: https://oleksandr-zhabenko.github.io/uk/rhythmicity/PhLADiPreLiO.Eng.21.html#types" putStrLn "" putStrLn "+r \t— afterwards are several unique digits not greater than 8 in the descending order — the first one is the length of the group of syllables to be considered as a period, the rest — positions of the maximums and minimums. Example: \"543\" means that the line is splitted into groups of 5 syllables starting from the beginning, then the positions of the most maximum (4 = 5 - 1) and the next (smaller) maximum (3 = 4 - 1). If there are no duplicated values then the lowest possible value here is 0, that corresponds to the lowest minimum. If there are duplicates then the lowest value here is the number of the groups of duplicates, e. g. in the sequence 1,6,3,3,4,4,5 that is one group there are two groups of duplicates — with 3 and 4 — and, therefore, the corresponding data after +r should be 7...2. The values less than the lowest minimum are neglected." @@ -162,11 +177,11 @@ putStrLn "" putStrLn "For the \"music\" mode the number of syllables printed for the line does not include the inserts. So the property value can be greater than this number." putStrLn "" - else generalF ldc compards html dcfile selStr (prestr, poststr) lineNmb fileDu numTest hc grpp sylD descending hashStep emptyline splitting (filesave, codesave) concurrently (unwords arg3s) variants1 >> return () + else generalF power10 ldc compards html dcfile selStr (prestr, poststr) lineNmb fileDu numTest hc grpp sylD descending hashStep emptyline splitting (filesave, codesave) concurrently (unwords arg3s) variants1 >> return () bSpecs :: CLSpecifications -bSpecs = (zip ["+c","+d","+k","+r","+s","-t","+ul","+w","+x"] . cycle $ [1]) `mappend` [("+f",2),("+m",2),("+dc",2)] +bSpecs = (zip ["+c","+d","+k","+r","+s","-t","+ul","+w","+x","+q"] . cycle $ [1]) `mappend` [("+f",2),("+m",2),("+dc",2)] aSpecs :: CLSpecifications aSpecs = zip ["-h", "+l", "+n","-p", "-C"] . cycle $ [0] diff --git a/Phladiprelio/Ukrainian/IO.hs b/Phladiprelio/Ukrainian/IO.hs --- a/Phladiprelio/Ukrainian/IO.hs +++ b/Phladiprelio/Ukrainian/IO.hs @@ -1,11 +1,11 @@ -{-# LANGUAGE NoImplicitPrelude, BangPatterns #-} +{-# LANGUAGE NoImplicitPrelude #-} module Phladiprelio.Ukrainian.IO where import GHC.Arr import GHC.Base import GHC.Num (Integer,(+),(-),(*)) -import GHC.Real (fromIntegral,(/),quot,rem,quotRem,round) +import GHC.Real (fromIntegral,(/),quot,rem,quotRem,round,(^)) import GHC.Enum (fromEnum,toEnum) import Text.Show (Show(..)) import Text.Read (readMaybe) @@ -33,7 +33,8 @@ import Phladiprelio.UniquenessPeriodsG generalF - :: Int -- ^ A 'length' of the next argument here. + :: Int -- ^ A power of 10. 10 in this power is then multiplied the value of distance if the next ['Double'] argument is not empty. The default one is 4. The right values are in the range [2..6]. + -> Int -- ^ A 'length' of the next argument here. -> [Double] -- ^ A list of non-negative values normed by 1.0 (the greatest of which is 1.0) that the line options are compared with. If null, then the program works as for version 0.12.1.0 without this newly-introduced argument since the version 0.13.0.0. The length of it must be a least common multiplier of the (number of syllables plus number of \'_digits\' groups) to work correctly. Is not used when the next 'FilePath' and 'String' arguments are not null. -> Bool -- ^ If 'True' then adds \"
\" to line endings for double column output -> FilePath -- ^ A path to the file to save double columns output to. If empty then just prints to 'stdout'. @@ -54,12 +55,12 @@ -> String -- ^ An initial string to be analysed. -> [String] -> IO [String] -generalF ldc compards html dcfile selStr (prestr, poststr) lineNmb file numTest hc (grps,mxms) k descending hashStep emptyline splitting (fs,code) concurrently initstr universalSet@(u1:u2:us) = do +generalF power10 ldc compards html dcfile selStr (prestr, poststr) lineNmb file numTest hc (grps,mxms) k descending hashStep emptyline splitting (fs,code) concurrently initstr universalSet@(u1:u2:us) = do syllableDurationsDs <- readSyllableDurations file let syllN = countSyll initstr -- universalSet = map unwords . permutations . words $ rs f ldc compards syllableDurationsDs grps mxms -- Since the version 0.12.0.0, has a possibility to evaluate diversity property. - | null selStr = (if null compards then (sum . countHashes2G hashStep hc grps mxms) else (round . (*10000) . distanceSqrG2 ldc compards)) . readBasic3 ((if null file then case k of { 1 -> syllableDurationsD; 2 -> syllableDurationsD2; 3 -> syllableDurationsD3; 4 -> syllableDurationsD4} + | null selStr = (if null compards then (sum . countHashes2G hashStep hc grps mxms) else (round . (*10^power10) . distanceSqrG2 ldc compards)) . readBasic3 ((if null file then case k of { 1 -> syllableDurationsD; 2 -> syllableDurationsD2; 3 -> syllableDurationsD3; 4 -> syllableDurationsD4} else if length syllableDurationsDs >= k then syllableDurationsDs !! (k - 1) else syllableDurationsD2) . createSyllablesUkrS) (mconcat) | otherwise = fromIntegral . diverse2GGL (selectSounds selStr) [100,101] . convertToProperUkrainianI8 . filter (\c -> not (isDigit c) && c /= '_') hSetNewlineMode stdout universalNewlineMode @@ -118,8 +119,8 @@ | r1 == 1 || r1 == 3 = 10*q1 + (if emptyline then 5 else r1) | r1 < 0 = -10*q1 + (if emptyline then -4 else r1) | otherwise = 10*q1 + (if emptyline then 4 else r1) -generalF _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ [u1] = mapM putStrLn [u1] >> return [u1] -generalF _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ = let strOutput = ["You have specified the data and constraints on it that lead to no further possible options.", "Please, specify another data and constraints."] in mapM putStrLn strOutput >> return strOutput +generalF _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ [u1] = mapM putStrLn [u1] >> return [u1] +generalF _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ = let strOutput = ["You have specified the data and constraints on it that lead to no further possible options.", "Please, specify another data and constraints."] in mapM putStrLn strOutput >> return strOutput data PhladiprelioUkr = S Int Integer String deriving Eq diff --git a/phladiprelio-ukrainian-simple.cabal b/phladiprelio-ukrainian-simple.cabal --- a/phladiprelio-ukrainian-simple.cabal +++ b/phladiprelio-ukrainian-simple.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: phladiprelio-ukrainian-simple -version: 0.13.1.0 +version: 0.13.2.0 -- A short (one-line) description of the package. synopsis: A PhLADiPreLiO implementation for Ukrainian that uses hashes and asynchronous concurrency.