diff --git a/docs/Manifest.toml b/docs/Manifest.toml index 48bffea..3df1280 100644 --- a/docs/Manifest.toml +++ b/docs/Manifest.toml @@ -12,9 +12,9 @@ uuid = "621f4979-c628-5d54-868e-fcf4e3e8185c" version = "1.5.0" [[AbstractTrees]] -git-tree-sha1 = "03e0550477d86222521d254b741d470ba17ea0b5" +git-tree-sha1 = "2d9c9a55f9c93e8887ad391fbae72f8ef55e1177" uuid = "1520ce14-60c1-5f80-bbc7-55ef81b5835c" -version = "0.3.4" +version = "0.4.5" [[Adapt]] deps = ["LinearAlgebra", "Requires"] @@ -27,7 +27,6 @@ uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f" version = "1.1.1" [[Artifacts]] -git-tree-sha1 = "c30985d8821e0cd73870b17b0ed0ce6dc44cb744" uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" [[Base64]] @@ -63,6 +62,12 @@ git-tree-sha1 = "7ebbd653f74504447f1c33b91cd706a69a1b189f" uuid = "aaaa29a8-35af-508c-8bc3-b662a17a0fe5" version = "0.14.4" +[[CodecZlib]] +deps = ["TranscodingStreams", "Zlib_jll"] +git-tree-sha1 = "59939d8a997469ee05c4b4944560a820f9ba0d73" +uuid = "944b1d66-785c-5afd-91f1-9de20f533193" +version = "0.7.4" + [[ColorSchemes]] deps = ["ColorTypes", "ColorVectorSpace", "Colors", "FixedPointNumbers", "PrecompileTools", "Random"] git-tree-sha1 = "67c1f244b991cad9b0aa4b7540fb758c2488b129" @@ -163,21 +168,21 @@ version = "0.10.11" [[DocStringExtensions]] deps = ["LibGit2"] -git-tree-sha1 = "b19534d1895d702889b219c382a6e18010797f0b" +git-tree-sha1 = "2fb1e02f2b635d0845df5d7c167fec4dd739b00d" uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" -version = "0.8.6" +version = "0.9.3" [[Documenter]] -deps = ["ANSIColoredPrinters", "Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"] -git-tree-sha1 = "350dced36c11f794c6c4da5dc6493ec894e50c16" +deps = ["ANSIColoredPrinters", "AbstractTrees", "Base64", "CodecZlib", "Dates", "DocStringExtensions", "Downloads", "Git", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "MarkdownAST", "Pkg", "PrecompileTools", "REPL", "RegistryInstances", "SHA", "TOML", "Test", "Unicode"] +git-tree-sha1 = "4a40af50e8b24333b9ec6892546d9ca5724228eb" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -version = "0.27.5" +version = "1.3.0" [[DocumenterTools]] -deps = ["AbstractTrees", "Base64", "DocStringExtensions", "Documenter", "FileWatching", "Gumbo", "LibGit2", "Sass"] -git-tree-sha1 = "d0574a2a4950fdcde104b7f3d1b34f0417fa9f10" +deps = ["AbstractTrees", "Base64", "DocStringExtensions", "Documenter", "FileWatching", "Gumbo", "LibGit2", "OpenSSH_jll", "Sass"] +git-tree-sha1 = "7605a88f75625836ce47102b8915041fae231ff5" uuid = "35a29f4d-8980-5a13-9543-d66fff28ecb8" -version = "0.1.13" +version = "0.1.19" [[Downloads]] deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"] @@ -214,10 +219,10 @@ uuid = "c87230d0-a227-11e9-1b43-d7ebe4e7570a" version = "0.4.1" [[FFMPEG_jll]] -deps = ["Artifacts", "Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "JLLWrappers", "LAME_jll", "Libdl", "Ogg_jll", "OpenSSL_jll", "Opus_jll", "PCRE2_jll", "Zlib_jll", "libaom_jll", "libass_jll", "libfdk_aac_jll", "libvorbis_jll", "x264_jll", "x265_jll"] -git-tree-sha1 = "466d45dc38e15794ec7d5d63ec03d776a9aff36e" +deps = ["Artifacts", "Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "JLLWrappers", "LAME_jll", "Libdl", "Ogg_jll", "OpenSSL_jll", "Opus_jll", "PCRE2_jll", "Pkg", "Zlib_jll", "libaom_jll", "libass_jll", "libfdk_aac_jll", "libvorbis_jll", "x264_jll", "x265_jll"] +git-tree-sha1 = "74faea50c1d007c85837327f6775bea60b5492dd" uuid = "b22a6f82-2f65-5046-a5b2-351ab43fb4e5" -version = "4.4.4+1" +version = "4.4.2+2" [[FFTW]] deps = ["AbstractFFTs", "FFTW_jll", "LinearAlgebra", "MKL_jll", "Preferences", "Reexport"] @@ -287,6 +292,18 @@ git-tree-sha1 = "9b02998aba7bf074d14de89f9d37ca24a1a0b046" uuid = "78b55507-aeef-58d4-861c-77aaff3498b1" version = "0.21.0+0" +[[Git]] +deps = ["Git_jll"] +git-tree-sha1 = "51764e6c2e84c37055e846c516e9015b4a291c7d" +uuid = "d7ba0133-e1db-5d97-8f8c-041e4b3a1eb2" +version = "1.3.0" + +[[Git_jll]] +deps = ["Artifacts", "Expat_jll", "JLLWrappers", "LibCURL_jll", "Libdl", "Libiconv_jll", "OpenSSL_jll", "PCRE2_jll", "Zlib_jll"] +git-tree-sha1 = "d8be4aab0f4e043cc40984e9097417307cce4c03" +uuid = "f8c6e375-362e-5223-8a59-34ff63f689eb" +version = "2.36.1+2" + [[Glib_jll]] deps = ["Artifacts", "Gettext_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Libiconv_jll", "Libmount_jll", "PCRE2_jll", "Zlib_jll"] git-tree-sha1 = "359a1ba2e320790ddbe4ee8b4d54a305c0ea2aff" @@ -311,15 +328,15 @@ version = "0.0.3" [[Gumbo]] deps = ["AbstractTrees", "Gumbo_jll", "Libdl"] -git-tree-sha1 = "e711d08d896018037d6ff0ad4ebe675ca67119d4" +git-tree-sha1 = "a1a138dfbf9df5bace489c7a9d5196d6afdfa140" uuid = "708ec375-b3d6-5a57-a7ce-8257bf98657a" -version = "0.8.0" +version = "0.8.2" [[Gumbo_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "89baea4583316379413109fe88c290b19c990f86" +git-tree-sha1 = "29070dee9df18d9565276d68a596854b1764aa38" uuid = "528830af-5a63-567c-a44a-034ed33b8444" -version = "0.10.1+2" +version = "0.10.2+0" [[HTTP]] deps = ["Base64", "Dates", "IniFile", "Logging", "MbedTLS", "NetworkOptions", "Sockets", "URIs"] @@ -335,9 +352,9 @@ version = "2.8.1+1" [[IOCapture]] deps = ["Logging", "Random"] -git-tree-sha1 = "f7be53659ab06ddc986428d3a9dcc95f6fa6705a" +git-tree-sha1 = "8b72179abc660bfab5e28472e019392b97d0985c" uuid = "b5f81e59-6552-4d32-b1f0-c071b021bf89" -version = "0.2.2" +version = "0.2.4" [[IniFile]] git-tree-sha1 = "f550e6e32074c939295eb5ea6de31849ac2c9625" @@ -394,16 +411,16 @@ uuid = "1019f520-868f-41f5-a6de-eb00f4b6a39c" version = "0.1.7" [[JLLWrappers]] -deps = ["Preferences"] -git-tree-sha1 = "642a199af8b68253517b80bd3bfd17eb4e84df6e" +deps = ["Artifacts", "Preferences"] +git-tree-sha1 = "7e5d6779a1e09a36db2a7b6cff50942a0a7d0fca" uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" -version = "1.3.0" +version = "1.5.0" [[JSON]] deps = ["Dates", "Mmap", "Parsers", "Unicode"] -git-tree-sha1 = "8076680b162ada2a031f707ac7b4953e30667a37" +git-tree-sha1 = "31e996f0a15c7b280ba9f76636b3ff9e2ae58c9a" uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" -version = "0.21.2" +version = "0.21.4" [[JpegTurbo_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] @@ -446,6 +463,11 @@ git-tree-sha1 = "cad560042a7cc108f5a4c24ea1431a9221f22c1b" uuid = "23fbe1c1-3f47-55db-b15f-69d7ec21a316" version = "0.16.2" +[[LazilyInitializedFields]] +git-tree-sha1 = "8f7f3cabab0fd1800699663533b6d5cb3fc0e612" +uuid = "0e77f7df-68c5-4e49-93ce-4cd80f5598bf" +version = "1.2.2" + [[LazyArtifacts]] deps = ["Artifacts", "Pkg"] uuid = "4af54fe1-eca0-43a8-85a7-787d91b784e3" @@ -549,6 +571,12 @@ version = "0.5.13" deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" +[[MarkdownAST]] +deps = ["AbstractTrees", "Markdown"] +git-tree-sha1 = "465a70f0fc7d443a00dcdc3267a497397b8a3899" +uuid = "d0879d2d-cac2-40c8-9cee-1863dc0c7391" +version = "0.1.2" + [[MbedTLS]] deps = ["Dates", "MbedTLS_jll", "MozillaCACerts_jll", "NetworkOptions", "Random", "Sockets"] git-tree-sha1 = "c067a280ddc25f196b5e7df3877c6b226d390aaf" @@ -622,11 +650,17 @@ deps = ["Artifacts", "Libdl"] uuid = "05823500-19ac-5b8b-9628-191a04bc5112" version = "0.8.1+0" +[[OpenSSH_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "OpenSSL_jll", "Pkg", "Zlib_jll"] +git-tree-sha1 = "1b2f042897343a9dfdcc9366e4ecbd3d00780c49" +uuid = "9bd350c2-7e96-507f-8002-3f2e150b4e1b" +version = "8.9.0+1" + [[OpenSSL_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "60e3045590bd104a16fefb12836c00c0ef8c7f8c" +git-tree-sha1 = "a12e56c72edee3ce6b96667745e6cbbe5498f200" uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" -version = "3.0.13+0" +version = "1.1.23+0" [[OpenSpecFun_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"] @@ -651,10 +685,10 @@ uuid = "efcefdf7-47ab-520b-bdef-62a2eaa19f15" version = "10.40.0+0" [[Parsers]] -deps = ["Dates"] -git-tree-sha1 = "d7fa6237da8004be601e19bd6666083056649918" +deps = ["Dates", "PrecompileTools", "UUIDs"] +git-tree-sha1 = "8489905bcdbcfac64d1daa51ca07c0d8f0283821" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "2.1.3" +version = "2.8.1" [[Pipe]] git-tree-sha1 = "6842804e7867b115ca9de748a0cf6b364523c16d" @@ -704,9 +738,9 @@ version = "1.2.1" [[Preferences]] deps = ["TOML"] -git-tree-sha1 = "00cfd92944ca9c760982747e9a1d0d5d86ab1e5a" +git-tree-sha1 = "9306f6085165d270f7e3db02af26a400d580f5c6" uuid = "21216c6a-2e73-6563-6e65-726566657250" -version = "1.2.2" +version = "1.4.3" [[PrettyTables]] deps = ["Crayons", "LaTeXStrings", "Markdown", "PrecompileTools", "Printf", "Reexport", "StringManipulation", "Tables"] @@ -720,9 +754,9 @@ uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" [[Qt6Base_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "Fontconfig_jll", "Glib_jll", "JLLWrappers", "Libdl", "Libglvnd_jll", "OpenSSL_jll", "Vulkan_Loader_jll", "Xorg_libSM_jll", "Xorg_libXext_jll", "Xorg_libXrender_jll", "Xorg_libxcb_jll", "Xorg_xcb_util_cursor_jll", "Xorg_xcb_util_image_jll", "Xorg_xcb_util_keysyms_jll", "Xorg_xcb_util_renderutil_jll", "Xorg_xcb_util_wm_jll", "Zlib_jll", "libinput_jll", "xkbcommon_jll"] -git-tree-sha1 = "37b7bb7aabf9a085e0044307e1717436117f2b3b" +git-tree-sha1 = "7c29f0e8c575428bd84dc3c72ece5178caa67336" uuid = "c0090381-4147-56d7-9ebc-da0b1113ec56" -version = "6.5.3+1" +version = "6.5.2+2" [[REPL]] deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"] @@ -749,6 +783,12 @@ git-tree-sha1 = "45e428421666073eab6f2da5c9d310d99bb12f9b" uuid = "189a3867-3050-52da-a836-e630ba90ab69" version = "1.2.2" +[[RegistryInstances]] +deps = ["LazilyInitializedFields", "Pkg", "TOML", "Tar"] +git-tree-sha1 = "ffd19052caf598b8653b99404058fce14828be51" +uuid = "2792f1a3-b283-48e8-9a74-f99dce5104f3" +version = "0.1.0" + [[RelocatableFolders]] deps = ["SHA", "Scratch"] git-tree-sha1 = "ffdaf70d81cf6ff22c2b6e733c900c3321cab864" @@ -858,7 +898,6 @@ version = "0.3.4" [[TOML]] deps = ["Dates"] -git-tree-sha1 = "44aaac2d2aec4a850302f9aa69127c74f0c3787e" uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76" version = "1.0.0" @@ -901,6 +940,12 @@ git-tree-sha1 = "cc54d5c9803309474014a8955a96e4adcd11bcf4" uuid = "f269a46b-ccf7-5d73-abea-4c690281aa53" version = "1.14.0" +[[TranscodingStreams]] +deps = ["Random", "Test"] +git-tree-sha1 = "14389d51751169994b2e1317d5c72f7dc4f21045" +uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa" +version = "0.10.6" + [[URIs]] git-tree-sha1 = "67db6cc7b3821e19ebe75791a9dd19c9b1188f2b" uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4" @@ -1188,9 +1233,9 @@ version = "1.6.43+1" [[libsass_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "663428b7ebaf60c60ee147f0f9466430e9959ad6" +git-tree-sha1 = "941afb93587dcec07f89e511057f5efc0bec6f0d" uuid = "47bcb7c8-5119-555a-9eeb-0afcc36cd728" -version = "3.5.5+0" +version = "3.6.4+0" [[libvorbis_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Ogg_jll", "Pkg"] diff --git a/docs/Project.toml b/docs/Project.toml index ee2442e..ba00840 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -4,4 +4,4 @@ DocumenterTools = "35a29f4d-8980-5a13-9543-d66fff28ecb8" EntropyHub = "3938faea-3bfa-4bc3-8092-0c6746ff9af1" [compat] -Documenter = "0.27.5" +Documenter = ">= 0.27.5" diff --git a/src/_EspEn2D.jl b/src/_EspEn2D.jl index 0244a0e..baa9628 100644 --- a/src/_EspEn2D.jl +++ b/src/_EspEn2D.jl @@ -6,7 +6,7 @@ export EspEn2D Returns the bidimensional Espinosa entropy estimate (`Esp2D`) estimated for the data matrix (`Mat`) using the default parameters: time delay = 1, tolerance threshold = 20, percentage similarity = 0.7 - logarithm = natural, matrix template size = [floor(H/10) floor(W/10)] + logarithm = natural, matrix template size = [floor(H/10) floor(W/10)], (where H and W represent the height (rows) and width (columns) of the data matrix `Mat`) ** The minimum number of rows and columns of `Mat` must be > 10. @@ -24,7 +24,7 @@ export EspEn2D (default: [floor(H/10) floor(W/10)]) \n `tau` - Time Delay, a positive integer (default: 1) \n `r` - Tolerance threshold, a positive scalar (default: 20) \n - `ps` - Percentage similarity, a value in range [0 1] (default: 0.7) \n + `ps` - Percentage similarity, a value in range [0 1], (default: 0.7) \n `Logx` - Logarithm base, a positive scalar (default: natural) \n `Lock` - By default, EspEn2D only permits matrices with a maximum size of 128 x 128 to prevent memory errors when storing data diff --git a/src/_PermEn2D.jl b/src/_PermEn2D.jl index 0fce386..419d431 100644 --- a/src/_PermEn2D.jl +++ b/src/_PermEn2D.jl @@ -5,7 +5,7 @@ export PermEn2D Returns the bidimensional permutation entropy estimate (`Perm2D`) estimated for the data matrix (`Mat`) using the default parameters: time delay = 1, - logarithm = natural, template matrix size = [floor(H/10) floor(W/10)] + logarithm = natural, template matrix size = [floor(H/10) floor(W/10)], (where H and W represent the height (rows) and width (columns) of the data matrix `Mat`) \n ** The minimum dimension size of Mat must be > 10.**