diff --git a/scripts/Manifest.toml b/scripts/Manifest.toml index e79a94f42008521e02b007e60b313a91c6225134..2c7d134ac37f3d854cb181701923c115eb94f5b2 100644 --- a/scripts/Manifest.toml +++ b/scripts/Manifest.toml @@ -2,27 +2,27 @@ [[AbstractFFTs]] deps = ["LinearAlgebra"] -git-tree-sha1 = "8ed9de2f1b1a9b1dee48582ad477c6e67b83eb2c" +git-tree-sha1 = "485ee0867925449198280d4af84bdb46a2a404d0" uuid = "621f4979-c628-5d54-868e-fcf4e3e8185c" -version = "1.0.0" +version = "1.0.1" [[Adapt]] deps = ["LinearAlgebra"] -git-tree-sha1 = "ffcfa2d345aaee0ef3d8346a073d5dd03c983ebe" +git-tree-sha1 = "84918055d15b3114ede17ac6a7182f68870c16f7" uuid = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" -version = "3.2.0" +version = "3.3.1" + +[[ArgTools]] +uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f" [[ArrayInterface]] -deps = ["IfElse", "LinearAlgebra", "Requires", "SparseArrays"] -git-tree-sha1 = "ee07ae00e3cc277dcfa5507ce25be522313ecc3e" +deps = ["IfElse", "LinearAlgebra", "Requires", "SparseArrays", "Static"] +git-tree-sha1 = "cdb00a6fb50762255021e5571cf95df3e1797a51" uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9" -version = "3.1.1" +version = "3.1.23" [[Artifacts]] -deps = ["Pkg"] -git-tree-sha1 = "c30985d8821e0cd73870b17b0ed0ce6dc44cb744" uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" -version = "1.3.0" [[AxisAlgorithms]] deps = ["LinearAlgebra", "Random", "SparseArrays", "WoodburyMatrices"] @@ -32,19 +32,13 @@ version = "1.0.0" [[AxisArrays]] deps = ["Dates", "IntervalSets", "IterTools", "RangeArrays"] -git-tree-sha1 = "f31f50712cbdf40ee8287f0443b57503e34122ef" +git-tree-sha1 = "d127d5e4d86c7680b20c35d40b503c74b9a39b5e" uuid = "39de3d68-74b9-583c-8d2d-e117c070f3a9" -version = "0.4.3" +version = "0.4.4" [[Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" -[[BinaryProvider]] -deps = ["Libdl", "Logging", "SHA"] -git-tree-sha1 = "ecdec412a9abc8db54c0efc5548c64dfce072058" -uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232" -version = "0.5.10" - [[Bzip2_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "c3598e525718abcc440f69cc6d5f60dda0a1b61e" @@ -58,15 +52,15 @@ version = "0.4.1" [[CSV]] deps = ["Dates", "Mmap", "Parsers", "PooledArrays", "SentinelArrays", "Tables", "Unicode"] -git-tree-sha1 = "1f79803452adf73e2d3fc84785adb7aaca14db36" +git-tree-sha1 = "b83aa3f513be680454437a0eee21001607e5d983" uuid = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b" -version = "0.8.3" +version = "0.8.5" [[CSVFiles]] deps = ["CodecZlib", "DataValues", "FileIO", "HTTP", "IterableTables", "IteratorInterfaceExtensions", "TableShowUtils", "TableTraits", "TableTraitsUtils", "TextParse"] -git-tree-sha1 = "96e5ca744988563da0b4dac199287e2790fdb5dd" +git-tree-sha1 = "d4dd66b73d3c811daa67587980bf45a179d16983" uuid = "5d742f6a-9f54-50ce-8119-2520741973ca" -version = "1.0.0" +version = "1.0.1" [[Cairo_jll]] deps = ["Artifacts", "Bzip2_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "JLLWrappers", "LZO_jll", "Libdl", "Pixman_jll", "Pkg", "Xorg_libXext_jll", "Xorg_libXrender_jll", "Zlib_jll", "libpng_jll"] @@ -80,53 +74,47 @@ git-tree-sha1 = "a0f80a09780eed9b1d106a1bf62041c2efc995bc" uuid = "aafaddc9-749c-510e-ac4f-586e18779b91" version = "0.2.2" -[[CategoricalArrays]] -deps = ["DataAPI", "Future", "JSON", "Missings", "Printf", "Statistics", "StructTypes", "Unicode"] -git-tree-sha1 = "99809999c8ee01fa89498480b147f7394ea5450f" -uuid = "324d7699-5711-5eae-9e2f-1d82baa6b597" -version = "0.9.2" - [[ChainRulesCore]] deps = ["Compat", "LinearAlgebra", "SparseArrays"] -git-tree-sha1 = "de4f08843c332d355852721adb1592bce7924da3" +git-tree-sha1 = "bdc0937269321858ab2a4f288486cb258b9a0af7" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "0.9.29" +version = "1.3.0" [[CodeTracking]] deps = ["InteractiveUtils", "UUIDs"] -git-tree-sha1 = "8ad457cfeb0bca98732c97958ef81000a543e73e" +git-tree-sha1 = "9aa8a5ebb6b5bf469a7e0e2b5202cf6f8c291104" uuid = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2" -version = "1.0.5" +version = "1.0.6" [[CodecZlib]] -deps = ["BinaryProvider", "Libdl", "TranscodingStreams"] -git-tree-sha1 = "05916673a2627dd91b4969ff8ba6941bc85a960e" +deps = ["TranscodingStreams", "Zlib_jll"] +git-tree-sha1 = "ded953804d019afa9a3f98981d99b33e3db7b6da" uuid = "944b1d66-785c-5afd-91f1-9de20f533193" -version = "0.6.0" +version = "0.7.0" [[ColorSchemes]] -deps = ["ColorTypes", "Colors", "FixedPointNumbers", "Random", "StaticArrays"] -git-tree-sha1 = "3141757b5832ee7a0386db87997ee5a23ff20f4d" +deps = ["ColorTypes", "Colors", "FixedPointNumbers", "Random"] +git-tree-sha1 = "9995eb3977fbf67b86d0a0a0508e83017ded03f2" uuid = "35d6a980-a343-548e-a6ea-1d62b119f2f4" -version = "3.10.2" +version = "3.14.0" [[ColorTypes]] deps = ["FixedPointNumbers", "Random"] -git-tree-sha1 = "4bffea7ed1a9f0f3d1a131bbcd4b925548d75288" +git-tree-sha1 = "024fe24d83e4a5bf5fc80501a314ce0d1aa35597" uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" -version = "0.10.9" +version = "0.11.0" [[ColorVectorSpace]] -deps = ["ColorTypes", "Colors", "FixedPointNumbers", "LinearAlgebra", "SpecialFunctions", "Statistics", "StatsBase"] -git-tree-sha1 = "4d17724e99f357bfd32afa0a9e2dda2af31a9aea" +deps = ["ColorTypes", "FixedPointNumbers", "LinearAlgebra", "SpecialFunctions", "Statistics", "TensorCore"] +git-tree-sha1 = "42a9b08d3f2f951c9b283ea427d96ed9f1f30343" uuid = "c3611d14-8923-5661-9e6a-0046d554d3a4" -version = "0.8.7" +version = "0.9.5" [[Colors]] -deps = ["ColorTypes", "FixedPointNumbers", "InteractiveUtils", "Reexport"] -git-tree-sha1 = "ac5f2213e56ed8a34a3dd2f681f4df1166b34929" +deps = ["ColorTypes", "FixedPointNumbers", "Reexport"] +git-tree-sha1 = "417b0ed7b8b838aa6ca0a87aadf1bb9eb111ce40" uuid = "5ae59095-9a9b-59fe-a467-6f913c188581" -version = "0.12.6" +version = "0.12.8" [[CommonSubexpressions]] deps = ["MacroTools", "Test"] @@ -136,15 +124,13 @@ version = "0.3.0" [[Compat]] deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"] -git-tree-sha1 = "919c7f3151e79ff196add81d7f4e45d91bbf420b" +git-tree-sha1 = "344f143fa0ec67e47917848795ab19c6a455f32c" uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "3.25.0" +version = "3.32.0" [[CompilerSupportLibraries_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "8e695f735fca77e9708e795eda62afdb869cbb70" +deps = ["Artifacts", "Libdl"] uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" -version = "0.3.4+0" [[ComputationalResources]] git-tree-sha1 = "52cb3ec90e8a8bea0e62e275ba577ad0f74821f7" @@ -169,26 +155,26 @@ uuid = "a8cc5b0e-0ffa-5ad4-8c14-923d3ee1735f" version = "4.0.4" [[CustomUnitRanges]] -git-tree-sha1 = "537c988076d001469093945f3bd0b300b8d3a7f3" +git-tree-sha1 = "1a3f97f907e6dd8983b744d2642651bb162a3f7a" uuid = "dc8bdbbb-1ca9-579f-8c36-e416f6a65cce" -version = "1.0.1" +version = "1.0.2" [[DataAPI]] -git-tree-sha1 = "dfb3b7e89e395be1e25c2ad6d7690dc29cc53b1d" +git-tree-sha1 = "ee400abb2298bd13bfc3df1c412ed228061a2385" uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a" -version = "1.6.0" +version = "1.7.0" [[DataFrames]] -deps = ["CategoricalArrays", "Compat", "DataAPI", "Future", "InvertedIndices", "IteratorInterfaceExtensions", "LinearAlgebra", "Markdown", "Missings", "PooledArrays", "PrettyTables", "Printf", "REPL", "Reexport", "SortingAlgorithms", "Statistics", "TableTraits", "Tables", "Unicode"] -git-tree-sha1 = "b0db5579803eabb33f1274ca7ca2f472fdfb7f2a" +deps = ["Compat", "DataAPI", "Future", "InvertedIndices", "IteratorInterfaceExtensions", "LinearAlgebra", "Markdown", "Missings", "PooledArrays", "PrettyTables", "Printf", "REPL", "Reexport", "SortingAlgorithms", "Statistics", "TableTraits", "Tables", "Unicode"] +git-tree-sha1 = "d785f42445b63fc86caa08bb9a9351008be9b765" uuid = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" -version = "0.22.5" +version = "1.2.2" [[DataStructures]] deps = ["Compat", "InteractiveUtils", "OrderedCollections"] -git-tree-sha1 = "4437b64df1e0adccc3e5d1adbc3ac741095e4677" +git-tree-sha1 = "7d9d316f04214f7efdbb6398d545446e246eff02" uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" -version = "0.18.9" +version = "0.18.10" [[DataTables]] deps = ["DataValues", "ReadOnlyArrays", "TableShowUtils", "TableTraitsUtils"] @@ -223,29 +209,39 @@ version = "1.0.3" [[DiffRules]] deps = ["NaNMath", "Random", "SpecialFunctions"] -git-tree-sha1 = "214c3fcac57755cfda163d91c58893a8723f93e9" +git-tree-sha1 = "3ed8fa7178a10d1cd0f1ca524f249ba6937490c0" uuid = "b552c78f-8df3-52c6-915a-8e097449b14b" -version = "1.0.2" +version = "1.3.0" [[Distances]] -deps = ["LinearAlgebra", "Statistics"] -git-tree-sha1 = "366715149014943abd71aa647a07a43314158b2d" +deps = ["LinearAlgebra", "Statistics", "StatsAPI"] +git-tree-sha1 = "abe4ad222b26af3337262b8afb28fab8d215e9f8" uuid = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7" -version = "0.10.2" +version = "0.10.3" [[Distributed]] deps = ["Random", "Serialization", "Sockets"] uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" +[[DocStringExtensions]] +deps = ["LibGit2"] +git-tree-sha1 = "a32185f5428d3986f47c2ab78b1f216d5e6cc96f" +uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" +version = "0.8.5" + [[DoubleFloats]] -deps = ["GenericSVD", "GenericSchur", "LinearAlgebra", "Polynomials", "Printf", "Quadmath", "Random", "Requires", "SpecialFunctions"] -git-tree-sha1 = "3351fb3839b6967604f9abca62fd3c1f85875906" +deps = ["GenericLinearAlgebra", "LinearAlgebra", "Polynomials", "Printf", "Quadmath", "Random", "Requires", "SpecialFunctions"] +git-tree-sha1 = "1c962cf7e75c09a5f1fbf504df7d6a06447a1129" uuid = "497a8b3b-efae-58df-a0af-a86822472b78" -version = "1.1.15" +version = "1.1.23" + +[[Downloads]] +deps = ["ArgTools", "LibCURL", "NetworkOptions"] +uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6" [[DualTVDD]] deps = ["Distributed", "LinearAlgebra", "Outsource", "StaticArrays", "StaticKernels"] -path = "../code" +path = ".." uuid = "93adc0ee-851f-4b8b-8bf8-c8a87ded093b" version = "0.1.0" @@ -263,26 +259,20 @@ version = "1.1.0" [[Expat_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "1402e52fcda25064f51c77a9655ce8680b76acf0" +git-tree-sha1 = "b3bfd02e98aedfa5cf885665493c5598c350cd2f" uuid = "2e619515-83b5-522b-bb60-26c02a35a201" -version = "2.2.7+6" +version = "2.2.10+0" [[ExprTools]] -git-tree-sha1 = "10407a39b87f29d47ebaca8edbc75d7c302ff93e" +git-tree-sha1 = "b7e3d17636b348f005f11040025ae8c6f645fe92" uuid = "e2ba6199-217a-4e67-a87a-7c52f15ade04" -version = "0.1.3" - -[[EzXML]] -deps = ["Printf", "XML2_jll"] -git-tree-sha1 = "0fa3b52a04a4e210aeb1626def9c90df3ae65268" -uuid = "8f5d6c58-4d21-5cfd-889c-e3ad7ee6a615" -version = "1.1.0" +version = "0.1.6" [[FFMPEG]] -deps = ["FFMPEG_jll", "x264_jll"] -git-tree-sha1 = "9a73ffdc375be61b0e4516d83d880b265366fe1f" +deps = ["FFMPEG_jll"] +git-tree-sha1 = "b57e3acbe22f8484b4b5ff66a7499717fe1a9cc8" uuid = "c87230d0-a227-11e9-1b43-d7ebe4e7570a" -version = "0.4.0" +version = "0.4.1" [[FFMPEG_jll]] deps = ["Artifacts", "Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "JLLWrappers", "LAME_jll", "LibVPX_jll", "Libdl", "Ogg_jll", "OpenSSL_jll", "Opus_jll", "Pkg", "Zlib_jll", "libass_jll", "libfdk_aac_jll", "libvorbis_jll", "x264_jll", "x265_jll"] @@ -297,37 +287,37 @@ uuid = "4f61f5a4-77b1-5117-aa51-3ab5ef4ef0cd" version = "0.3.1" [[FFTW]] -deps = ["AbstractFFTs", "FFTW_jll", "IntelOpenMP_jll", "Libdl", "LinearAlgebra", "MKL_jll", "Reexport"] -git-tree-sha1 = "1b48dbde42f307e48685fa9213d8b9f8c0d87594" +deps = ["AbstractFFTs", "FFTW_jll", "LinearAlgebra", "MKL_jll", "Preferences", "Reexport"] +git-tree-sha1 = "f985af3b9f4e278b1d24434cbb546d6092fca661" uuid = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341" -version = "1.3.2" +version = "1.4.3" [[FFTW_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "5a0d4b6a22a34d17d53543bd124f4b08ed78e8b0" +git-tree-sha1 = "3676abafff7e4ff07bbd2c42b3d8201f31653dcc" uuid = "f5851436-0d7a-5f13-b9de-f02708fd171a" -version = "3.3.9+7" +version = "3.3.9+8" [[FileIO]] -deps = ["Pkg"] -git-tree-sha1 = "fee8955b9dfa7bec67117ef48085fb2b559b9c22" +deps = ["Pkg", "Requires", "UUIDs"] +git-tree-sha1 = "256d8e6188f3f1ebfa1a5d17e072a0efafa8c5bf" uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" -version = "1.4.5" +version = "1.10.1" [[FileWatching]] uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee" [[FillArrays]] -deps = ["LinearAlgebra", "Random", "SparseArrays"] -git-tree-sha1 = "bed538ad14d132aa8240bb2e8ab82fcd2fd2f548" +deps = ["LinearAlgebra", "Random", "SparseArrays", "Statistics"] +git-tree-sha1 = "8c8eac2af06ce35973c3eadb4ab3243076a408e7" uuid = "1a297f60-69ca-5386-bcde-b61e274b549b" -version = "0.11.3" +version = "0.12.1" [[FiniteDiff]] deps = ["ArrayInterface", "LinearAlgebra", "Requires", "SparseArrays", "StaticArrays"] -git-tree-sha1 = "f6f80c8f934efd49a286bb5315360be66956dfc4" +git-tree-sha1 = "8b3c09b56acaf3c0e581c66638b85c8650ee9dca" uuid = "6a86dc24-6348-571c-b903-95158fe2bd41" -version = "2.8.0" +version = "2.8.1" [[FixedPointNumbers]] deps = ["Statistics"] @@ -348,10 +338,10 @@ uuid = "59287772-0a20-5a39-b81b-1366585eb4c0" version = "0.4.2" [[ForwardDiff]] -deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "NaNMath", "Random", "SpecialFunctions", "StaticArrays"] -git-tree-sha1 = "d48a40c0f54f29a5c8748cfb3225719accc72b77" +deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "LinearAlgebra", "NaNMath", "Printf", "Random", "SpecialFunctions", "StaticArrays"] +git-tree-sha1 = "b5e930ac60b613ef3406da6d4f42c35d8dc51419" uuid = "f6369f11-7733-5829-9624-2563aa707210" -version = "0.10.16" +version = "0.10.19" [[FreeType2_jll]] deps = ["Artifacts", "Bzip2_jll", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"] @@ -361,9 +351,9 @@ version = "2.10.1+5" [[FriBidi_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "0d20aed5b14dd4c9a2453c1b601d08e1149679cc" +git-tree-sha1 = "aa31987c2ba8704e23c6c8ba8a4f769d5d7e4f91" uuid = "559328eb-81f9-559d-9380-de523a88c83c" -version = "1.0.5+6" +version = "1.0.10+0" [[Future]] deps = ["Random"] @@ -371,51 +361,45 @@ uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" [[GLFW_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Libglvnd_jll", "Pkg", "Xorg_libXcursor_jll", "Xorg_libXi_jll", "Xorg_libXinerama_jll", "Xorg_libXrandr_jll"] -git-tree-sha1 = "a1bbf700b5388bffc3d882f4f4d625cf1c714fd7" +git-tree-sha1 = "dba1e8614e98949abfa60480b13653813d8f0157" uuid = "0656b61e-2033-5cc2-a64a-77c0f6c09b89" -version = "3.3.2+1" +version = "3.3.5+0" [[GR]] -deps = ["Base64", "DelimitedFiles", "GR_jll", "HTTP", "JSON", "LinearAlgebra", "Pkg", "Printf", "Random", "Serialization", "Sockets", "Test", "UUIDs"] -git-tree-sha1 = "aaebdf5588281c2902f499b49e67953f2b409c9c" +deps = ["Base64", "DelimitedFiles", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Pkg", "Printf", "Random", "Serialization", "Sockets", "Test", "UUIDs"] +git-tree-sha1 = "182da592436e287758ded5be6e32c406de3a2e47" uuid = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71" -version = "0.54.0" +version = "0.58.1" [[GR_jll]] -deps = ["Artifacts", "Bzip2_jll", "Cairo_jll", "FFMPEG_jll", "Fontconfig_jll", "GLFW_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pixman_jll", "Pkg", "Qt_jll", "Zlib_jll", "libpng_jll"] -git-tree-sha1 = "8aee6fa096b0cbdb05e71750c978b96a08c78951" +deps = ["Artifacts", "Bzip2_jll", "Cairo_jll", "FFMPEG_jll", "Fontconfig_jll", "GLFW_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pixman_jll", "Pkg", "Qt5Base_jll", "Zlib_jll", "libpng_jll"] +git-tree-sha1 = "d59e8320c2747553788e4fc42231489cc602fa50" uuid = "d2c73de3-f751-5644-a686-071e5b155ba9" -version = "0.53.0+0" +version = "0.58.1+0" -[[GenericSVD]] -deps = ["LinearAlgebra"] -git-tree-sha1 = "62909c3eda8a25b5673a367d1ad2392ebb265211" -uuid = "01680d73-4ee2-5a08-a1aa-533608c188bb" -version = "0.3.0" - -[[GenericSchur]] -deps = ["LinearAlgebra", "Printf"] -git-tree-sha1 = "c6b383b8d005e6487b41ade2051e3410ec60af8a" -uuid = "c145ed77-6b09-5dd9-b285-bf645a82121e" -version = "0.4.1" +[[GenericLinearAlgebra]] +deps = ["LinearAlgebra", "Printf", "Random"] +git-tree-sha1 = "ff291c1827030ffaacaf53e3c83ed92d4d5e6fb6" +uuid = "14197337-ba66-59df-a3e3-ca00e7dcff7a" +version = "0.2.5" [[GeometryBasics]] deps = ["EarCut_jll", "IterTools", "LinearAlgebra", "StaticArrays", "StructArrays", "Tables"] -git-tree-sha1 = "4d4f72691933d5b6ee1ff20e27a102c3ae99d123" +git-tree-sha1 = "58bcdf5ebc057b085e58d95c138725628dd7453c" uuid = "5c1252a2-5f33-56bf-86c9-59e7332b4326" -version = "0.3.9" +version = "0.4.1" [[Gettext_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "XML2_jll"] -git-tree-sha1 = "8c14294a079216000a0bdca5ec5a447f073ddc9d" +deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "XML2_jll"] +git-tree-sha1 = "9b02998aba7bf074d14de89f9d37ca24a1a0b046" uuid = "78b55507-aeef-58d4-861c-77aaff3498b1" -version = "0.20.1+7" +version = "0.21.0+0" [[Glib_jll]] deps = ["Artifacts", "Gettext_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Libiconv_jll", "Libmount_jll", "PCRE_jll", "Pkg", "Zlib_jll"] -git-tree-sha1 = "04690cc5008b38ecbdfede949220bc7d9ba26397" +git-tree-sha1 = "7bf67e9a481712b3dbe9cb3dac852dc4b1162e02" uuid = "7746bdde-850d-59dc-9ae8-88ece973131d" -version = "2.59.0+4" +version = "2.68.3+0" [[Graphics]] deps = ["Colors", "LinearAlgebra", "NaNMath"] @@ -424,15 +408,15 @@ uuid = "a2bd30eb-e257-5431-a919-1863eab51364" version = "1.1.0" [[Grisu]] -git-tree-sha1 = "03d381f65183cb2d0af8b3425fde97263ce9a995" +git-tree-sha1 = "53bb909d1151e57e2484c3d1b53e19552b887fb2" uuid = "42e2da0e-8278-4e71-bc24-59509adca0fe" -version = "1.0.0" +version = "1.0.2" [[HTTP]] -deps = ["Base64", "Dates", "IniFile", "MbedTLS", "Sockets"] -git-tree-sha1 = "c7ec02c4c6a039a98a15f955462cd7aea5df4508" +deps = ["Base64", "Dates", "IniFile", "Logging", "MbedTLS", "NetworkOptions", "Sockets", "URIs"] +git-tree-sha1 = "44e3b40da000eab4ccb1aecdc4801c040026aeb5" uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" -version = "0.8.19" +version = "0.9.13" [[IdentityRanges]] deps = ["OffsetArrays"] @@ -447,81 +431,98 @@ version = "0.1.0" [[ImageAxes]] deps = ["AxisArrays", "ImageCore", "Reexport", "SimpleTraits"] -git-tree-sha1 = "1592c7fd668ac9cdcef73f704ca457ccdaac2933" +git-tree-sha1 = "794ad1d922c432082bc1aaa9fa8ffbd1fe74e621" uuid = "2803e5a7-5153-5ecf-9a86-9b4c37f5f5ac" -version = "0.6.8" +version = "0.6.9" [[ImageContrastAdjustment]] deps = ["ColorVectorSpace", "ImageCore", "ImageTransformations", "Parameters"] -git-tree-sha1 = "210f8fb370d4b97fa12d65322c62df06f3e5563b" +git-tree-sha1 = "2e6084db6cccab11fe0bc3e4130bd3d117092ed9" uuid = "f332f351-ec65-5f6a-b3d1-319c6670881a" -version = "0.3.6" +version = "0.3.7" [[ImageCore]] deps = ["AbstractFFTs", "Colors", "FixedPointNumbers", "Graphics", "MappedArrays", "MosaicViews", "OffsetArrays", "PaddedViews", "Reexport"] -git-tree-sha1 = "79badd979fbee9b8980cd995cd5a86a9e93b8ad7" +git-tree-sha1 = "db645f20b59f060d8cfae696bc9538d13fd86416" uuid = "a09fc81d-aa75-5fe9-8630-4744c3626534" -version = "0.8.20" +version = "0.8.22" [[ImageDistances]] deps = ["ColorVectorSpace", "Distances", "ImageCore", "ImageMorphology", "LinearAlgebra", "Statistics"] -git-tree-sha1 = "159e24b4313d9197eef900e97fbd7365986f2844" +git-tree-sha1 = "6378c34a3c3a216235210d19b9f495ecfff2f85f" uuid = "51556ac3-7006-55f5-8cb3-34580c88182d" -version = "0.2.10" +version = "0.2.13" [[ImageFiltering]] -deps = ["CatIndices", "ColorVectorSpace", "ComputationalResources", "DataStructures", "FFTViews", "FFTW", "ImageCore", "ImageMetadata", "LinearAlgebra", "OffsetArrays", "Requires", "SparseArrays", "StaticArrays", "Statistics", "TiledIteration"] -git-tree-sha1 = "f82a52fa2e684d4ed69028b16188852ff94b3f75" +deps = ["CatIndices", "ColorVectorSpace", "ComputationalResources", "DataStructures", "FFTViews", "FFTW", "ImageCore", "LinearAlgebra", "OffsetArrays", "Requires", "SparseArrays", "StaticArrays", "Statistics", "TiledIteration"] +git-tree-sha1 = "bf96839133212d3eff4a1c3a80c57abc7cfbf0ce" uuid = "6a3955dd-da59-5b1f-98d4-e7296123deb5" -version = "0.6.19" +version = "0.6.21" [[ImageIO]] -deps = ["FileIO", "Netpbm", "PNGFiles"] -git-tree-sha1 = "0d6d09c28d67611c68e25af0c2df7269c82b73c7" +deps = ["FileIO", "Netpbm", "PNGFiles", "TiffImages", "UUIDs"] +git-tree-sha1 = "d067570b4d4870a942b19d9ceacaea4fb39b69a1" uuid = "82e4d734-157c-48bb-816b-45c225c6df19" -version = "0.4.1" +version = "0.5.6" + +[[ImageMagick]] +deps = ["FileIO", "ImageCore", "ImageMagick_jll", "InteractiveUtils", "Libdl", "Pkg", "Random"] +git-tree-sha1 = "5bc1cb62e0c5f1005868358db0692c994c3a13c6" +uuid = "6218d12a-5da1-5696-b52f-db25d2ecc6d1" +version = "1.2.1" + +[[ImageMagick_jll]] +deps = ["JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pkg", "Zlib_jll", "libpng_jll"] +git-tree-sha1 = "1c0a2295cca535fabaf2029062912591e9b61987" +uuid = "c73af94c-d91f-53ed-93a7-00f77d67a9d7" +version = "6.9.10-12+3" [[ImageMetadata]] deps = ["AxisArrays", "ColorVectorSpace", "ImageAxes", "ImageCore", "IndirectArrays"] -git-tree-sha1 = "ff77c7f234e7d8a618958fcf23b6959f2cbef2c6" +git-tree-sha1 = "ae76038347dc4edcdb06b541595268fca65b6a42" uuid = "bc367c6b-8a6b-528e-b4bd-a4b897500b49" -version = "0.9.4" +version = "0.9.5" [[ImageMorphology]] deps = ["ColorVectorSpace", "ImageCore", "LinearAlgebra", "TiledIteration"] -git-tree-sha1 = "113df7743f1e18da5f5ea5f98eb59ceb77092734" +git-tree-sha1 = "68e7cbcd7dfaa3c2f74b0a8ab3066f5de8f2b71d" uuid = "787d08f9-d448-5407-9aad-5290dd7ab264" -version = "0.2.9" +version = "0.2.11" [[ImageQualityIndexes]] deps = ["ColorVectorSpace", "ImageCore", "ImageDistances", "ImageFiltering", "OffsetArrays", "Statistics"] -git-tree-sha1 = "80484f9e1beae36860ed8022f195d04c751cfec6" +git-tree-sha1 = "1198f85fa2481a3bb94bf937495ba1916f12b533" uuid = "2996bd0c-7a13-11e9-2da2-2f5ce47296a9" -version = "0.2.1" +version = "0.2.2" [[ImageShow]] -deps = ["Base64", "FileIO", "ImageCore", "Requires"] -git-tree-sha1 = "c9df184bc7c2e665f971079174aabb7d18f1845f" +deps = ["Base64", "FileIO", "ImageCore", "OffsetArrays", "Requires", "StackViews"] +git-tree-sha1 = "832abfd709fa436a562db47fd8e81377f72b01f9" uuid = "4e3cecfd-b093-5904-9786-8bbb286a6a31" -version = "0.2.3" +version = "0.3.1" [[ImageTransformations]] deps = ["AxisAlgorithms", "ColorVectorSpace", "CoordinateTransformations", "IdentityRanges", "ImageCore", "Interpolations", "OffsetArrays", "Rotations", "StaticArrays"] -git-tree-sha1 = "0426a62ca1a23f3b1ee75cc0e47320d859abd6ae" +git-tree-sha1 = "e4cc551e4295a5c96545bb3083058c24b78d4cf0" uuid = "02fcd773-0e25-5acc-982a-7f6622650795" -version = "0.8.9" +version = "0.8.13" [[Images]] -deps = ["AxisArrays", "Base64", "ColorVectorSpace", "FileIO", "Graphics", "ImageAxes", "ImageContrastAdjustment", "ImageCore", "ImageDistances", "ImageFiltering", "ImageMetadata", "ImageMorphology", "ImageQualityIndexes", "ImageShow", "ImageTransformations", "IndirectArrays", "OffsetArrays", "Random", "Reexport", "SparseArrays", "StaticArrays", "Statistics", "StatsBase", "TiledIteration"] -git-tree-sha1 = "535bcaae047f017f4fd7331ee859b75f2b27e505" +deps = ["AxisArrays", "Base64", "ColorVectorSpace", "FileIO", "Graphics", "ImageAxes", "ImageContrastAdjustment", "ImageCore", "ImageDistances", "ImageFiltering", "ImageIO", "ImageMagick", "ImageMetadata", "ImageMorphology", "ImageQualityIndexes", "ImageShow", "ImageTransformations", "IndirectArrays", "OffsetArrays", "Random", "Reexport", "SparseArrays", "StaticArrays", "Statistics", "StatsBase", "TiledIteration"] +git-tree-sha1 = "8b714d5e11c91a0d945717430ec20f9251af4bd2" uuid = "916415d5-f1e6-5110-898d-aaa5f9f070e0" -version = "0.23.3" +version = "0.24.1" [[IndirectArrays]] git-tree-sha1 = "c2a145a145dc03a7620af1444e0264ef907bd44f" uuid = "9b13fd28-a010-5f03-acff-a1bbcff69959" version = "0.5.1" +[[Inflate]] +git-tree-sha1 = "f5fc07d4e706b84f72d54eedcc1c13d92fb0871c" +uuid = "d25df0c9-e2be-5dd7-82c8-3ad0b3e990b9" +version = "0.1.2" + [[IniFile]] deps = ["Test"] git-tree-sha1 = "098e4d2c533924c921f9f9847274f2ad89e018b8" @@ -539,16 +540,16 @@ deps = ["Markdown"] uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" [[Interpolations]] -deps = ["AxisAlgorithms", "LinearAlgebra", "OffsetArrays", "Random", "Ratios", "SharedArrays", "SparseArrays", "StaticArrays", "WoodburyMatrices"] -git-tree-sha1 = "eb1dd6d5b2275faaaa18533e0fc5f9171cec25fa" +deps = ["AxisAlgorithms", "ChainRulesCore", "LinearAlgebra", "OffsetArrays", "Random", "Ratios", "Requires", "SharedArrays", "SparseArrays", "StaticArrays", "WoodburyMatrices"] +git-tree-sha1 = "61aa005707ea2cebf47c8d780da8dc9bc4e0c512" uuid = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59" -version = "0.13.1" +version = "0.13.4" [[IntervalSets]] deps = ["Dates", "EllipsisNotation", "Statistics"] -git-tree-sha1 = "93a6d78525feb0d3ee2a2ae83a7d04db1db5663f" +git-tree-sha1 = "3cc368af3f110a767ac786560045dceddfc16758" uuid = "8197267c-284f-5f27-9208-e0e47529a953" -version = "0.5.2" +version = "0.5.3" [[Intervals]] deps = ["Dates", "Printf", "RecipesBase", "Serialization", "TimeZones"] @@ -562,6 +563,11 @@ git-tree-sha1 = "15732c475062348b0165684ffe28e85ea8396afc" uuid = "41ab1584-1d38-5bbf-9106-f11c6c58b48f" version = "1.0.0" +[[IrrationalConstants]] +git-tree-sha1 = "f76424439413893a832026ca355fe273e93bce94" +uuid = "92d709cd-6900-40b7-9082-c6be49f344b6" +version = "0.1.0" + [[IterTools]] git-tree-sha1 = "05110a2ab1fc5f932622ffea2a003221f4782c18" uuid = "c8e1da08-722c-5040-9ed9-7db0dc04731e" @@ -575,9 +581,9 @@ version = "1.0.0" [[IterativeSolvers]] deps = ["LinearAlgebra", "Printf", "Random", "RecipesBase", "SparseArrays"] -git-tree-sha1 = "6f5ef3206d9dc6510a8b8e2334b96454a2ade590" +git-tree-sha1 = "1a8c6237e78b714e901e406c096fc8a65528af7d" uuid = "42fd0dbc-a981-5370-80f2-aaf504508153" -version = "0.9.0" +version = "0.9.1" [[IteratorInterfaceExtensions]] git-tree-sha1 = "a3f24677c21f5bbe9d2a714f95dcd58337fb2856" @@ -585,81 +591,92 @@ uuid = "82899510-4779-5014-852e-03e436cf321d" version = "1.0.0" [[JLLWrappers]] -git-tree-sha1 = "a431f5f2ca3f4feef3bd7a5e94b8b8d4f2f647a0" +deps = ["Preferences"] +git-tree-sha1 = "642a199af8b68253517b80bd3bfd17eb4e84df6e" uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" -version = "1.2.0" +version = "1.3.0" [[JSON]] deps = ["Dates", "Mmap", "Parsers", "Unicode"] -git-tree-sha1 = "81690084b6198a2e1da36fcfda16eeca9f9f24e4" +git-tree-sha1 = "8076680b162ada2a031f707ac7b4953e30667a37" uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" -version = "0.21.1" +version = "0.21.2" [[JpegTurbo_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "9aff0587d9603ea0de2c6f6300d9f9492bbefbd3" +git-tree-sha1 = "d735490ac75c5cb9f1b00d8b5509c11984dc6943" uuid = "aacddb02-875f-59d6-b918-886e6ef4fbf8" -version = "2.0.1+3" +version = "2.1.0+0" [[JuliaInterpreter]] deps = ["CodeTracking", "InteractiveUtils", "Random", "UUIDs"] -git-tree-sha1 = "86439cef50a24fa981583476f48b197b7dea691e" +git-tree-sha1 = "1770e296094f7f11f394431d2878dbc1d6a6a0a3" uuid = "aa1ae85d-cabe-5617-a682-6adf51b2e16a" -version = "0.8.9" +version = "0.8.20" [[LAME_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "df381151e871f41ee86cee4f5f6fd598b8a68826" +git-tree-sha1 = "f6250b16881adf048549549fba48b1161acdac8c" uuid = "c1c5ebd0-6772-5130-a774-d5fcae4a789d" -version = "3.100.0+3" +version = "3.100.1+0" [[LZO_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "f128cd6cd05ffd6d3df0523ed99b90ff6f9b349a" +git-tree-sha1 = "e5b909bcf985c5e2605737d2ce278ed791b89be6" uuid = "dd4b983a-f0e5-5f8d-a1b7-129d4a5fb1ac" -version = "2.10.0+3" +version = "2.10.1+0" [[LaTeXStrings]] -git-tree-sha1 = "c7aebfecb1a60d59c0fe023a68ec947a208b1e6b" +git-tree-sha1 = "c7f1c695e06c01b95a67f0cd1d34994f3e7db104" uuid = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f" -version = "1.2.0" +version = "1.2.1" [[Latexify]] deps = ["Formatting", "InteractiveUtils", "LaTeXStrings", "MacroTools", "Markdown", "Printf", "Requires"] -git-tree-sha1 = "3a0084cec7bf157edcb45a67fac0647f88fe5eaf" +git-tree-sha1 = "a4b12a1bd2ebade87891ab7e36fdbce582301a92" uuid = "23fbe1c1-3f47-55db-b15f-69d7ec21a316" -version = "0.14.7" +version = "0.15.6" [[LazyArtifacts]] -deps = ["Pkg"] -git-tree-sha1 = "4bb5499a1fc437342ea9ab7e319ede5a457c0968" +deps = ["Artifacts", "Pkg"] uuid = "4af54fe1-eca0-43a8-85a7-787d91b784e3" -version = "1.3.0" + +[[LibCURL]] +deps = ["LibCURL_jll", "MozillaCACerts_jll"] +uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21" + +[[LibCURL_jll]] +deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"] +uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0" [[LibGit2]] -deps = ["Printf"] +deps = ["Base64", "NetworkOptions", "Printf", "SHA"] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" +[[LibSSH2_jll]] +deps = ["Artifacts", "Libdl", "MbedTLS_jll"] +uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8" + [[LibVPX_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "85fcc80c3052be96619affa2fe2e6d2da3908e11" +git-tree-sha1 = "12ee7e23fa4d18361e7c2cde8f8337d4c3101bc7" uuid = "dd192d2f-8180-539f-9fb4-cc70b1dcf69a" -version = "1.9.0+1" +version = "1.10.0+0" [[Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" [[Libffi_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "a2cd088a88c0d37eef7d209fd3d8712febce0d90" +git-tree-sha1 = "761a393aeccd6aa92ec3515e428c26bf99575b3b" uuid = "e9f186c6-92d2-5b65-8a66-fee21dc1b490" -version = "3.2.1+4" +version = "3.2.2+0" [[Libgcrypt_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgpg_error_jll", "Pkg"] -git-tree-sha1 = "b391a18ab1170a2e568f9fb8d83bc7c780cb9999" +git-tree-sha1 = "64613c82a59c120435c067c2b809fc61cf5166ae" uuid = "d4300ac3-e22c-5743-9152-c294e39db1e4" -version = "1.8.5+4" +version = "1.8.7+0" [[Libglvnd_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll", "Xorg_libXext_jll"] @@ -669,33 +686,33 @@ version = "1.3.0+3" [[Libgpg_error_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "ec7f2e8ad5c9fa99fc773376cdbc86d9a5a23cb7" +git-tree-sha1 = "c333716e46366857753e273ce6a69ee0945a6db9" uuid = "7add5ba3-2f88-524e-9cd5-f83b8a55f7b8" -version = "1.36.0+3" +version = "1.42.0+0" [[Libiconv_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "8e924324b2e9275a51407a4e06deb3455b1e359f" +git-tree-sha1 = "42b62845d70a619f063a7da093d995ec8e15e778" uuid = "94ce4f54-9a6c-5748-9c1c-f9c7231a4531" -version = "1.16.0+7" +version = "1.16.1+1" [[Libmount_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "51ad0c01c94c1ce48d5cad629425035ad030bfd5" +git-tree-sha1 = "9c30530bf0effd46e15e0fdcf2b8636e78cbbd73" uuid = "4b2f31a3-9ecc-558c-b454-b3730dcb73e9" -version = "2.34.0+3" +version = "2.35.0+0" [[Libtiff_jll]] deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Pkg", "Zlib_jll", "Zstd_jll"] -git-tree-sha1 = "291dd857901f94d683973cdf679984cdf73b56d0" +git-tree-sha1 = "340e257aada13f95f98ee352d316c3bed37c8ab9" uuid = "89763e89-9b03-5906-acba-b20f662cd828" -version = "4.1.0+2" +version = "4.3.0+0" [[Libuuid_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "f879ae9edbaa2c74c922e8b85bb83cc84ea1450b" +git-tree-sha1 = "7f3efec06033682db852f8b3bc3c1d2b0a0ab066" uuid = "38a345b3-de98-5d2b-a5d3-14cd9215e700" -version = "2.34.0+7" +version = "2.36.0+0" [[LineSearches]] deps = ["LinearAlgebra", "NLSolversBase", "NaNMath", "Parameters", "Printf"] @@ -709,18 +726,24 @@ uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" [[LinearMaps]] deps = ["LinearAlgebra", "SparseArrays"] -git-tree-sha1 = "81fe47fe6e8499463d3afcc90a42a8349caefe72" +git-tree-sha1 = "0a7c8fb69162e88412540b6c7bb28691e219372d" uuid = "7a12625a-238d-50fd-b39a-03d52299707e" -version = "3.2.0" +version = "3.4.0" + +[[LogExpFunctions]] +deps = ["DocStringExtensions", "IrrationalConstants", "LinearAlgebra"] +git-tree-sha1 = "3d682c07e6dd250ed082f883dc88aee7996bf2cc" +uuid = "2ab3a3ac-af41-5b50-aa03-7779005ae688" +version = "0.3.0" [[Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" [[LoweredCodeUtils]] deps = ["JuliaInterpreter"] -git-tree-sha1 = "f008f15264cc11de6de8cbdda3d4712dd152f0c3" +git-tree-sha1 = "491a883c4fef1103077a7f648961adbf9c8dd933" uuid = "6f1432cf-f94c-5a45-995e-cdbf5db27b0b" -version = "1.2.7" +version = "2.1.2" [[MKL_jll]] deps = ["Artifacts", "IntelOpenMP_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "Pkg"] @@ -730,15 +753,14 @@ version = "2021.1.1+1" [[MacroTools]] deps = ["Markdown", "Random"] -git-tree-sha1 = "6a8a2a625ab0dea913aba95c11370589e0239ff0" +git-tree-sha1 = "0fb723cd8c45858c22169b2e42269e53271a6df7" uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" -version = "0.5.6" +version = "0.5.7" [[MappedArrays]] -deps = ["FixedPointNumbers"] -git-tree-sha1 = "b92bd220c95a8bbe89af28f11201fd080e0e3fe7" +git-tree-sha1 = "e8b359ef06ec72e8c030463fe02efe5527ee5142" uuid = "dbb5928d-eab1-5f90-85c2-b9b0edb7c900" -version = "0.3.0" +version = "0.4.1" [[Markdown]] deps = ["Base64"] @@ -751,10 +773,8 @@ uuid = "739be429-bea8-5141-9913-cc70e7f3736d" version = "1.0.3" [[MbedTLS_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "0eef589dd1c26a3ac9d753fe1a8bcad63f956fa6" +deps = ["Artifacts", "Libdl"] uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" -version = "2.16.8+1" [[Measures]] git-tree-sha1 = "e498ddeee6f9fdb4551ce855a46f54dbd900245f" @@ -772,21 +792,30 @@ uuid = "a63ad114-7e13-5084-954f-fe012c677804" [[Mocking]] deps = ["ExprTools"] -git-tree-sha1 = "916b850daad0d46b8c71f65f719c49957e9513ed" +git-tree-sha1 = "748f6e1e4de814b101911e64cc12d83a6af66782" uuid = "78c3b35d-d492-501b-9361-3d52fe80e533" -version = "0.7.1" +version = "0.7.2" [[MosaicViews]] -deps = ["MappedArrays", "OffsetArrays", "PaddedViews"] -git-tree-sha1 = "614e8d77264d20c1db83661daadfab38e8e4b77e" +deps = ["MappedArrays", "OffsetArrays", "PaddedViews", "StackViews"] +git-tree-sha1 = "b34e3bc3ca7c94914418637cb10cc4d1d80d877d" uuid = "e94cdb99-869f-56ef-bcf0-1ae2bcbe0389" -version = "0.2.4" +version = "0.3.3" + +[[MozillaCACerts_jll]] +uuid = "14a3606d-f60d-562e-9121-12d972cd8159" + +[[MutableArithmetics]] +deps = ["LinearAlgebra", "SparseArrays", "Test"] +git-tree-sha1 = "3927848ccebcc165952dc0d9ac9aa274a87bfe01" +uuid = "d8a4904e-b15c-11e9-3269-09a3773c0cb0" +version = "0.2.20" [[NLSolversBase]] deps = ["DiffResults", "Distributed", "FiniteDiff", "ForwardDiff"] -git-tree-sha1 = "39d6bc45e99c96e6995cbddac02877f9b61a1dd1" +git-tree-sha1 = "144bab5b1443545bc4e791536c9f1eacb4eed06a" uuid = "d41bc354-129a-5804-8e4c-c37616107c6c" -version = "7.7.1" +version = "7.8.1" [[NaNMath]] git-tree-sha1 = "bfe47e760d60b82b66b61d2d44128b62e3a369fb" @@ -795,9 +824,12 @@ version = "0.3.5" [[Netpbm]] deps = ["ColorVectorSpace", "FileIO", "ImageCore"] -git-tree-sha1 = "03472ec5ea8884b791c6340712f3261c0f393691" +git-tree-sha1 = "09589171688f0039f13ebe0fdcc7288f50228b52" uuid = "f09324ee-3d7c-5217-9330-fc30815ba969" -version = "1.0.0" +version = "1.0.1" + +[[NetworkOptions]] +uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" [[Nullables]] git-tree-sha1 = "8f87854cc8f3685a60689d8edecaa29d2251979b" @@ -806,27 +838,27 @@ version = "1.0.0" [[OffsetArrays]] deps = ["Adapt"] -git-tree-sha1 = "986e7c0a0ef1863be969d191957ac32cb17d0d79" +git-tree-sha1 = "c0f4a4836e5f3e0763243b8324200af6d0e0f90c" uuid = "6fe1bfb0-de20-5000-8ca7-80f57d26f881" -version = "1.6.0" +version = "1.10.5" [[Ogg_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "a42c0f138b9ebe8b58eba2271c5053773bde52d0" +git-tree-sha1 = "7937eda4681660b4d6aeeecc2f7e1c81c8ee4e2f" uuid = "e7412a2a-1a6e-54c0-be00-318e2571c051" -version = "1.3.4+2" +version = "1.3.5+0" [[OpenSSL_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "71bbbc616a1d710879f5a1021bcba65ffba6ce58" +git-tree-sha1 = "15003dcb7d8db3c6c857fda14891a539a8f2705a" uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" -version = "1.1.1+6" +version = "1.1.10+0" [[OpenSpecFun_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "9db77584158d0ab52307f8c04f8e7c08ca76b5b3" +git-tree-sha1 = "13652491f6856acfd2db29360e1bbcd4565d04f1" uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e" -version = "0.5.3+4" +version = "0.5.5+0" [[OpticalFlowUtils]] deps = ["Colors", "FileIO", "LinearAlgebra", "StaticArrays"] @@ -836,20 +868,20 @@ version = "0.1.0" [[Optim]] deps = ["Compat", "FillArrays", "LineSearches", "LinearAlgebra", "NLSolversBase", "NaNMath", "Parameters", "PositiveFactorizations", "Printf", "SparseArrays", "StatsBase"] -git-tree-sha1 = "3286df38aba45acf7445f3acd87b7b57b7c7feb7" +git-tree-sha1 = "7863df65dbb2a0fa8f85fcaf0a41167640d2ebed" uuid = "429524aa-4258-5aef-a3af-852621145aeb" -version = "1.2.4" +version = "1.4.1" [[Opus_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "f9d57f4126c39565e05a2b0264df99f497fc6f37" +git-tree-sha1 = "51a08fb14ec28da2ec7a927c4337e4332c2a4720" uuid = "91d4177d-7536-5919-b921-800302f37372" -version = "1.3.1+3" +version = "1.3.2+0" [[OrderedCollections]] -git-tree-sha1 = "4fa2ba51070ec13fcc7517db714445b4ab986bdf" +git-tree-sha1 = "85f8e6578bf1f9ee0d11e7bb1b1456435479d47c" uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" -version = "1.4.0" +version = "1.4.1" [[Outsource]] deps = ["Distributed"] @@ -861,21 +893,21 @@ version = "0.1.0" [[PCRE_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "1b556ad51dceefdbf30e86ffa8f528b73c7df2bb" +git-tree-sha1 = "b2a7af664e098055a7529ad1a900ded962bca488" uuid = "2f80f16e-611a-54ab-bc61-aa92de5b98fc" -version = "8.42.0+4" +version = "8.44.0+0" [[PNGFiles]] deps = ["Base64", "CEnum", "ImageCore", "IndirectArrays", "OffsetArrays", "libpng_jll"] -git-tree-sha1 = "aa6e87a2361c2fe5a63b1a6a4b567f13aa108991" +git-tree-sha1 = "520e28d4026d16dcf7b8c8140a3041f0e20a9ca8" uuid = "f57f5aa1-a3ce-4bc8-8ab9-96f992907883" -version = "0.3.5" +version = "0.3.7" [[PaddedViews]] deps = ["OffsetArrays"] -git-tree-sha1 = "0fa5e78929aebc3f6b56e1a88cf505bb00a354c4" +git-tree-sha1 = "646eed6f6a5d8df6708f15ea7e02a7a2c4fe4800" uuid = "5432bcbf-9aad-5242-b902-cca2824c8663" -version = "0.5.8" +version = "0.5.10" [[Parameters]] deps = ["OrderedCollections", "UnPack"] @@ -885,20 +917,26 @@ version = "0.12.2" [[Parsers]] deps = ["Dates"] -git-tree-sha1 = "50c9a9ed8c714945e01cd53a21007ed3865ed714" +git-tree-sha1 = "bfd7d8c7fd87f04543810d9cbd3995972236ba1b" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "1.0.15" +version = "1.1.2" [[Pixman_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "6a20a83c1ae86416f0a5de605eaea08a552844a3" +git-tree-sha1 = "b4f5d02549a10e20780a24fce72bea96b6329e29" uuid = "30392449-352a-5448-841d-b1acce4e97dc" -version = "0.40.0+0" +version = "0.40.1+0" [[Pkg]] -deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] +deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"] uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" +[[PkgVersion]] +deps = ["Pkg"] +git-tree-sha1 = "a7a7e1a88853564e551e4eba8650f8c38df79b37" +uuid = "eebad327-c553-4316-9ea0-9fa01ccd7688" +version = "0.1.1" + [[PlotThemes]] deps = ["PlotUtils", "Requires", "Statistics"] git-tree-sha1 = "a3a964ce9dc7898193536002a6dd892b1b5a6f1d" @@ -907,27 +945,27 @@ version = "2.0.1" [[PlotUtils]] deps = ["ColorSchemes", "Colors", "Dates", "Printf", "Random", "Reexport", "Statistics"] -git-tree-sha1 = "ae9a295ac761f64d8c2ec7f9f24d21eb4ffba34d" +git-tree-sha1 = "501c20a63a34ac1d015d5304da0e645f42d91c9f" uuid = "995b91a9-d308-5afd-9ec6-746e21dbc043" -version = "1.0.10" +version = "1.0.11" [[Plots]] deps = ["Base64", "Contour", "Dates", "FFMPEG", "FixedPointNumbers", "GR", "GeometryBasics", "JSON", "Latexify", "LinearAlgebra", "Measures", "NaNMath", "PlotThemes", "PlotUtils", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "Requires", "Scratch", "Showoff", "SparseArrays", "Statistics", "StatsBase", "UUIDs"] -git-tree-sha1 = "7ecf7d0207e7208a5cad9fd3bd357f5d5eb16044" +git-tree-sha1 = "8365fa7758e2e8e4443ce866d6106d8ecbb4474e" uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" -version = "1.10.5" +version = "1.20.1" [[Polynomials]] -deps = ["Intervals", "LinearAlgebra", "OffsetArrays", "RecipesBase"] -git-tree-sha1 = "1c6c5b0c3713738d6b987903c529d80622c37e07" +deps = ["Intervals", "LinearAlgebra", "MutableArithmetics", "RecipesBase"] +git-tree-sha1 = "0bbfdcd8cda81b8144de4be8a67f5717e959a005" uuid = "f27b6e38-b328-58d1-80ce-0feddd5e7a45" -version = "1.2.0" +version = "2.0.14" [[PooledArrays]] -deps = ["DataAPI"] -git-tree-sha1 = "0e8f5c428a41a81cd71f76d76f2fc3415fe5a676" +deps = ["DataAPI", "Future"] +git-tree-sha1 = "cde4ce9d6f33219465b55162811d8de8139c0414" uuid = "2dfb63ee-cc39-5dd5-95bd-886bf059d720" -version = "1.1.0" +version = "1.2.1" [[PositiveFactorizations]] deps = ["LinearAlgebra"] @@ -935,21 +973,33 @@ git-tree-sha1 = "17275485f373e6673f7e7f97051f703ed5b15b20" uuid = "85a6dd25-e78a-55b7-8502-1745935b8125" version = "0.2.4" +[[Preferences]] +deps = ["TOML"] +git-tree-sha1 = "00cfd92944ca9c760982747e9a1d0d5d86ab1e5a" +uuid = "21216c6a-2e73-6563-6e65-726566657250" +version = "1.2.2" + [[PrettyTables]] deps = ["Crayons", "Formatting", "Markdown", "Reexport", "Tables"] -git-tree-sha1 = "574a6b3ea95f04e8757c0280bb9c29f1a5e35138" +git-tree-sha1 = "0d1245a357cc61c8cd61934c07447aa569ff22e6" uuid = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d" -version = "0.11.1" +version = "1.1.0" [[Printf]] deps = ["Unicode"] uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" -[[Qt_jll]] +[[ProgressMeter]] +deps = ["Distributed", "Printf"] +git-tree-sha1 = "afadeba63d90ff223a6a48d2009434ecee2ec9e8" +uuid = "92933f4c-e287-5a05-a399-4b506db050ca" +version = "1.7.1" + +[[Qt5Base_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "Fontconfig_jll", "Glib_jll", "JLLWrappers", "Libdl", "Libglvnd_jll", "OpenSSL_jll", "Pkg", "Xorg_libXext_jll", "Xorg_libxcb_jll", "Xorg_xcb_util_image_jll", "Xorg_xcb_util_keysyms_jll", "Xorg_xcb_util_renderutil_jll", "Xorg_xcb_util_wm_jll", "Zlib_jll", "xkbcommon_jll"] -git-tree-sha1 = "7760cfea90bec61814e31dfb204fa4b81bba7b57" -uuid = "ede63266-ebff-546c-83e0-1c6fb6d0efc8" -version = "5.15.2+1" +git-tree-sha1 = "ad368663a5e20dbb8d6dc2fddeefe4dae0781ae8" +uuid = "ea2cea3b-5b76-57ae-a6ef-0a8af62496e1" +version = "5.15.3+0" [[Quadmath]] deps = ["Printf", "Random", "Requires"] @@ -958,7 +1008,7 @@ uuid = "be4d8f0f-7fa4-5f49-b795-2f01399ab2dd" version = "0.5.5" [[REPL]] -deps = ["InteractiveUtils", "Markdown", "Sockets"] +deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"] uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" [[Random]] @@ -971,9 +1021,10 @@ uuid = "b3c3ace0-ae52-54e7-9d0b-2c1406fd6b9d" version = "0.3.2" [[Ratios]] -git-tree-sha1 = "37d210f612d70f3f7d57d488cb3b6eff56ad4e41" +deps = ["Requires"] +git-tree-sha1 = "7dff99fbc740e2f8228c6878e2aad6d7c2678098" uuid = "c84ed2f1-dad5-54f0-aa8e-dbefe2724439" -version = "0.4.0" +version = "0.4.1" [[ReadOnlyArrays]] deps = ["SparseArrays", "Test"] @@ -988,26 +1039,26 @@ version = "1.1.1" [[RecipesPipeline]] deps = ["Dates", "NaNMath", "PlotUtils", "RecipesBase"] -git-tree-sha1 = "c4d54a78e287de7ec73bbc928ce5eb3c60f80b24" +git-tree-sha1 = "2a7a2469ed5d94a98dea0e85c46fa653d76be0cd" uuid = "01d81517-befc-4cb6-b9ec-a95719d0359c" -version = "0.3.1" +version = "0.3.4" [[Reexport]] -git-tree-sha1 = "57d8440b0c7d98fc4f889e478e80f268d534c9d5" +git-tree-sha1 = "5f6c21241f0f655da3952fd60aa18477cf96c220" uuid = "189a3867-3050-52da-a836-e630ba90ab69" -version = "1.0.0" +version = "1.1.0" [[Requires]] deps = ["UUIDs"] -git-tree-sha1 = "cfbac6c1ed70c002ec6361e7fd334f02820d6419" +git-tree-sha1 = "4036a3bd08ac7e968e27c203d45f5fff15020621" uuid = "ae029012-a4dd-5104-9daa-d747884805df" -version = "1.1.2" +version = "1.1.3" [[Revise]] deps = ["CodeTracking", "Distributed", "FileWatching", "JuliaInterpreter", "LibGit2", "LoweredCodeUtils", "OrderedCollections", "Pkg", "REPL", "Requires", "UUIDs", "Unicode"] -git-tree-sha1 = "4697c220e6448fb5e9c55404ae1a13271d533b52" +git-tree-sha1 = "1947d2d75463bd86d87eaba7265b0721598dd803" uuid = "295af30f-e4ad-537b-8983-00126c2a3abe" -version = "3.1.12" +version = "3.1.19" [[Rotations]] deps = ["LinearAlgebra", "StaticArrays", "Statistics"] @@ -1020,15 +1071,15 @@ uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" [[Scratch]] deps = ["Dates"] -git-tree-sha1 = "ad4b278adb62d185bbcb6864dc24959ab0627bf6" +git-tree-sha1 = "0b4b7f1393cff97c33891da2a0bf69c6ed241fda" uuid = "6c6a2e73-6563-6170-7368-637461726353" -version = "1.0.3" +version = "1.1.0" [[SentinelArrays]] deps = ["Dates", "Random"] -git-tree-sha1 = "6ccde405cf0759eba835eb613130723cb8f10ff9" +git-tree-sha1 = "a3a337914a035b2d59c9cbe7f1a38aaba1265b02" uuid = "91c51154-3ec4-41a3-a24f-3f23e20d615c" -version = "1.2.16" +version = "1.3.6" [[Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" @@ -1039,40 +1090,52 @@ uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383" [[Showoff]] deps = ["Dates", "Grisu"] -git-tree-sha1 = "ee010d8f103468309b8afac4abb9be2e18ff1182" +git-tree-sha1 = "91eddf657aca81df9ae6ceb20b959ae5653ad1de" uuid = "992d4aef-0814-514b-bc4d-f2e9a6c4116f" -version = "0.3.2" +version = "1.0.3" [[SimpleTraits]] deps = ["InteractiveUtils", "MacroTools"] -git-tree-sha1 = "daf7aec3fe3acb2131388f93a4c409b8c7f62226" +git-tree-sha1 = "5d7e3f4e11935503d3ecaf7186eac40602e7d231" uuid = "699a6c99-e7fa-54fc-8d76-47d257e15c1d" -version = "0.9.3" +version = "0.9.4" [[Sockets]] uuid = "6462fe0b-24de-5631-8697-dd941f90decc" [[SortingAlgorithms]] -deps = ["DataStructures", "Random", "Test"] -git-tree-sha1 = "03f5898c9959f8115e30bc7226ada7d0df554ddd" +deps = ["DataStructures"] +git-tree-sha1 = "b3363d7460f7d098ca0912c69b082f75625d7508" uuid = "a2af1166-a08f-5f64-846c-94a0d3cef48c" -version = "0.3.1" +version = "1.0.1" [[SparseArrays]] deps = ["LinearAlgebra", "Random"] uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [[SpecialFunctions]] -deps = ["ChainRulesCore", "OpenSpecFun_jll"] -git-tree-sha1 = "5919936c0e92cff40e57d0ddf0ceb667d42e5902" +deps = ["ChainRulesCore", "LogExpFunctions", "OpenSpecFun_jll"] +git-tree-sha1 = "a322a9493e49c5f3a10b50df3aedaf1cdb3244b7" uuid = "276daf66-3868-5448-9aa4-cd146d93841b" -version = "1.3.0" +version = "1.6.1" + +[[StackViews]] +deps = ["OffsetArrays"] +git-tree-sha1 = "46e589465204cd0c08b4bd97385e4fa79a0c770c" +uuid = "cae243ae-269e-4f55-b966-ac2d0dc13c15" +version = "0.1.1" + +[[Static]] +deps = ["IfElse"] +git-tree-sha1 = "62701892d172a2fa41a1f829f66d2b0db94a9a63" +uuid = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" +version = "0.3.0" [[StaticArrays]] deps = ["LinearAlgebra", "Random", "Statistics"] -git-tree-sha1 = "9da72ed50e94dbff92036da395275ed114e04d49" +git-tree-sha1 = "3240808c6d463ac46f1c1cd7638375cd22abbccb" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "1.0.1" +version = "1.2.12" [[StaticKernels]] git-tree-sha1 = "b42c4dd298b987dfe9e7a4dcaa7e66e9efe1c828" @@ -1083,23 +1146,26 @@ version = "0.6.0" deps = ["LinearAlgebra", "SparseArrays"] uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" +[[StatsAPI]] +git-tree-sha1 = "1958272568dc176a1d881acb797beb909c785510" +uuid = "82ae8749-77ed-4fe6-ae5f-f523153014b0" +version = "1.0.0" + [[StatsBase]] -deps = ["DataAPI", "DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics"] -git-tree-sha1 = "400aa43f7de43aeccc5b2e39a76a79d262202b76" +deps = ["DataAPI", "DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"] +git-tree-sha1 = "fed1ec1e65749c4d96fc20dd13bea72b55457e62" uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" -version = "0.33.3" +version = "0.33.9" [[StructArrays]] -deps = ["Adapt", "DataAPI", "Tables"] -git-tree-sha1 = "26ea43b4be7e919a2390c3c0f824e7eb4fc19a0a" +deps = ["Adapt", "DataAPI", "StaticArrays", "Tables"] +git-tree-sha1 = "000e168f5cc9aded17b6999a560b7c11dda69095" uuid = "09ab397b-f2b6-538f-b94a-2f83cf4a842a" -version = "0.5.0" +version = "0.6.0" -[[StructTypes]] -deps = ["Dates", "UUIDs"] -git-tree-sha1 = "65a43f5218197bc7091b76bc273a5e323a1d7b0d" -uuid = "856f2bd8-1eba-4b0a-8007-ebc267875bd4" -version = "1.2.3" +[[TOML]] +deps = ["Dates"] +uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76" [[TableShowUtils]] deps = ["DataValues", "Dates", "JSON", "Markdown", "Test"] @@ -1109,9 +1175,9 @@ version = "0.2.5" [[TableTraits]] deps = ["IteratorInterfaceExtensions"] -git-tree-sha1 = "b1ad568ba658d8cbb3b892ed5380a6f3e781a81e" +git-tree-sha1 = "c06b2f539df1c6efa794486abfb6ed2022561a39" uuid = "3783bdb8-4a98-5b6b-af9a-565f29a5fe9c" -version = "1.0.0" +version = "1.0.1" [[TableTraitsUtils]] deps = ["DataValues", "IteratorInterfaceExtensions", "Missings", "TableTraits"] @@ -1121,37 +1187,58 @@ version = "1.0.1" [[Tables]] deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"] -git-tree-sha1 = "a716dde43d57fa537a19058d044b495301ba6565" +git-tree-sha1 = "d0c690d37c73aeb5ca063056283fde5585a41710" uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" -version = "1.3.2" +version = "1.5.0" + +[[Tar]] +deps = ["ArgTools", "SHA"] +uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e" + +[[TensorCore]] +deps = ["LinearAlgebra"] +git-tree-sha1 = "1feb45f88d133a655e001435632f019a9a1bcdb6" +uuid = "62fd8b95-f654-4bbd-a8a5-9c27f68ccd50" +version = "0.1.1" [[Test]] -deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] +deps = ["InteractiveUtils", "Logging", "Random", "Serialization"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [[TextParse]] deps = ["CodecZlib", "DataStructures", "Dates", "DoubleFloats", "Mmap", "Nullables", "WeakRefStrings"] -git-tree-sha1 = "af728c38c839aee693637e15e244074a02f16c68" +git-tree-sha1 = "eb1f4fb185c8644faa2d18d14c72f2c24412415f" uuid = "e0df1984-e451-5cb5-8b61-797a481e67e3" -version = "1.0.1" +version = "1.0.2" + +[[TiffImages]] +deps = ["ColorTypes", "DocStringExtensions", "FileIO", "FixedPointNumbers", "IndirectArrays", "Inflate", "OffsetArrays", "OrderedCollections", "PkgVersion", "ProgressMeter"] +git-tree-sha1 = "03fb246ac6e6b7cb7abac3b3302447d55b43270e" +uuid = "731e570b-9d59-4bfa-96dc-6df516fadf69" +version = "0.4.1" [[TiledIteration]] deps = ["OffsetArrays"] -git-tree-sha1 = "05f74c5b3c00d5336bc109416df2df907e3bd91d" +git-tree-sha1 = "52c5f816857bfb3291c7d25420b1f4aca0a74d18" uuid = "06e1c1a7-607b-532d-9fad-de7d9aa2abac" -version = "0.2.5" +version = "0.3.0" [[TimeZones]] -deps = ["Dates", "EzXML", "Mocking", "Pkg", "Printf", "RecipesBase", "Serialization", "Unicode"] -git-tree-sha1 = "4ba8a9579a243400db412b50300cd61d7447e583" +deps = ["Dates", "Future", "LazyArtifacts", "Mocking", "Pkg", "Printf", "RecipesBase", "Serialization", "Unicode"] +git-tree-sha1 = "81753f400872e5074768c9a77d4c44e70d409ef0" uuid = "f269a46b-ccf7-5d73-abea-4c690281aa53" -version = "1.5.3" +version = "1.5.6" [[TranscodingStreams]] deps = ["Random", "Test"] -git-tree-sha1 = "7c53c35547de1c5b9d46a4797cf6d8253807108c" +git-tree-sha1 = "216b95ea110b5972db65aa90f88d8d89dcb8851c" uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa" -version = "0.9.5" +version = "0.9.6" + +[[URIs]] +git-tree-sha1 = "97bbe755a53fe859669cd907f2d96aee8d2c1355" +uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4" +version = "1.3.0" [[UUIDs]] deps = ["Random", "SHA"] @@ -1167,9 +1254,9 @@ uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" [[Wayland_jll]] deps = ["Artifacts", "Expat_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Pkg", "XML2_jll"] -git-tree-sha1 = "dc643a9b774da1c2781413fd7b6dcd2c56bb8056" +git-tree-sha1 = "3e61f0b86f90dacb0bc0e73a0c5a83f6a8636e23" uuid = "a2964d1f-97da-50d4-b82a-358c7fce9d89" -version = "1.17.0+4" +version = "1.19.0+0" [[Wayland_protocols_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Wayland_jll"] @@ -1178,10 +1265,10 @@ uuid = "2381bf8a-dfd0-557d-9999-79630e7b1b91" version = "1.18.0+4" [[WeakRefStrings]] -deps = ["DataAPI", "Random", "Test"] -git-tree-sha1 = "28807f85197eaad3cbd2330386fac1dcb9e7e11d" +deps = ["DataAPI", "Parsers", "Random", "Test"] +git-tree-sha1 = "9ef95db08bf767499a74586bcbd4b5df30c19b9f" uuid = "ea10d353-3f73-51f8-a26c-33c1cb351aa5" -version = "0.6.2" +version = "1.1.0" [[WoodburyMatrices]] deps = ["LinearAlgebra", "SparseArrays"] @@ -1191,15 +1278,15 @@ version = "0.5.3" [[XML2_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "Zlib_jll"] -git-tree-sha1 = "be0db24f70aae7e2b89f2f3092e93b8606d659a6" +git-tree-sha1 = "1acf5bdf07aa0907e0a37d3718bb88d4b687b74a" uuid = "02c8fc9c-b97f-50b9-bbe4-9be30ff0a78a" -version = "2.9.10+3" +version = "2.9.12+0" [[XSLT_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgcrypt_jll", "Pkg", "XML2_jll"] -git-tree-sha1 = "2b3eac39df218762d2d005702d601cd44c997497" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgcrypt_jll", "Libgpg_error_jll", "Libiconv_jll", "Pkg", "XML2_jll", "Zlib_jll"] +git-tree-sha1 = "91844873c4085240b95e795f692c4cec4d805f8a" uuid = "aed1982a-8fda-507f-9586-7b0439959a61" -version = "1.1.33+4" +version = "1.1.34+0" [[Xorg_libX11_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libxcb_jll", "Xorg_xtrans_jll"] @@ -1328,16 +1415,14 @@ uuid = "c5fb5394-a638-5e4d-96e5-b29de1b5cf10" version = "1.4.0+3" [[Zlib_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "320228915c8debb12cb434c59057290f0834dbf6" +deps = ["Libdl"] uuid = "83775a58-1f1d-513f-b197-d71354ab007a" -version = "1.2.11+18" [[Zstd_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "2c1332c54931e83f8f94d310fa447fd743e8d600" +git-tree-sha1 = "cc4bf3fdde8b7e3e9fa0351bdeedba1cf3b7f6e6" uuid = "3161d3a3-bdf6-5164-811a-617609db77b4" -version = "1.4.8+0" +version = "1.5.0+0" [[libass_jll]] deps = ["Artifacts", "Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"] @@ -1353,15 +1438,23 @@ version = "0.1.6+4" [[libpng_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"] -git-tree-sha1 = "6abbc424248097d69c0c87ba50fcb0753f93e0ee" +git-tree-sha1 = "94d180a6d2b5e55e447e2d27a29ed04fe79eb30c" uuid = "b53b4c65-9356-5827-b1ea-8c7a1a84506f" -version = "1.6.37+6" +version = "1.6.38+0" [[libvorbis_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Ogg_jll", "Pkg"] -git-tree-sha1 = "fa14ac25af7a4b8a7f61b287a124df7aab601bcd" +git-tree-sha1 = "c45f4e40e7aafe9d086379e5578947ec8b95a8fb" uuid = "f27f6e37-5d2b-51aa-960f-b287f2bc3b7a" -version = "1.3.6+6" +version = "1.3.7+0" + +[[nghttp2_jll]] +deps = ["Artifacts", "Libdl"] +uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d" + +[[p7zip_jll]] +deps = ["Artifacts", "Libdl"] +uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0" [[x264_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] diff --git a/scripts/run.jl b/scripts/run.jl new file mode 100644 index 0000000000000000000000000000000000000000..7b6c767d6e3b5b3f56f1de4465f69ecd8f71b4bb --- /dev/null +++ b/scripts/run.jl @@ -0,0 +1,17 @@ +include("run_experiments.jl") + +const datapath = joinpath(@__DIR__, "..", "data") + +ctx = Util.Context(datapath) + +#ctx(experiment_convergence_test, "convergence/test") +ctx(experiment_convergence_denoising, "convergence/denoising") +ctx(experiment_convergence_inpainting, "convergence/inpainting") +ctx(experiment_convergence_opticalflow, "convergence/opticalflow") + +ctx(experiment_surrogate_outerinner, "surrogate/outerinner") +ctx(experiment_surrogate_outerinner_ref, "surrogate/outerinner_ref") + +ctx(experiment_global_basic, "global/basic") + +ctx(experiment_scaling_opticalflow, "scaling/opticalflow") diff --git a/scripts/run_experiments.jl b/scripts/run_experiments.jl index 49816452285dabf529703e4705429fc7aaf1bfc1..d5c164d333ff2be18ae095b95febc8d47d2503e6 100644 --- a/scripts/run_experiments.jl +++ b/scripts/run_experiments.jl @@ -1,20 +1,3 @@ -# environment setup - -const scriptpath = @__DIR__ -const datapath = joinpath(@__DIR__, "..", "data") - - -#using Pkg -#Pkg.activate(scriptpath) -#Pkg.instantiate() - -# function savelog(df, name) -# CSV.write(joinpath(datapath, "$(name)_energies.csv"), df) -# #display(df) -# df2 = DataFrame([a => a == :k ? b[1:end-1] : abs.(diff(b)) for (a, b) in pairs(eachcol(df))]) -# #display(df2) -# CSV.write(joinpath(datapath, "$(name)_energydiffs.csv"), df2) -# end # experiments using Random: MersenneTwister @@ -35,8 +18,6 @@ using DualTVDD: fetch_u using FileIO using ImageIO using OpticalFlowUtils -using FileIO: @format_str, add_format -add_format(format"FLO", b"PIEH", ".flo", [:OpticalFlowUtils]) using Optim using Plots using FFTW @@ -49,6 +30,34 @@ isdefined(Main, :Revise) && Revise.track(joinpath(@__DIR__, "util.jl")) using .Util +""" + logfilter(dt; a=20) + +Reduce dataset such that the resulting dataset would have approximately +equidistant datapoints on a log-scale. `a` controls density. +""" +logfilter(dt; a=20) = filter(:k => k -> round(a*log(k+1)) - round(a*log(k)) > 0, dt) + +""" + halve(img) + +Scale `img` to half size using box-avaraging. +""" +function halve(img) + all(iseven.(size(img))) || throw(ArgumentError("uneven size")) + + res = similar(img, size(img) .÷ 2) + fill!(res, zero(eltype(res))) + + for i in CartesianIndices(img) + j = CartesianIndex((Tuple(i) .+ 1) .÷ 2) + res[j] += img[i] + end + res ./= 2 ^ ndims(img) + + return res +end + # Problems function DenoiseProblem(img::AbstractArray{T,d}; λ, β = 0.) where {T,d} @@ -112,7 +121,6 @@ toimg(arr) = Gray.(clamp.(arr, 0., 1.)) loadimg(x) = Float64.(load(x)) saveimg(io, x) = save(io, toimg(x)) - function run_algs(dataf, algs; maxiters) flatten(x; kwargs...) = (;kwargs..., (Symbol(a, "_", c) => d for (a, b) in pairs(x) for (c, d) in pairs(b))...) @@ -187,8 +195,8 @@ function run_while(fwhile, alg) return st end -function suite(::Path{(:convergence, :test)}, input, output) - #fo = loadimg(input("input_original.png")) +function experiment_convergence_test(ctx) + #fo = loadimg(joinpath(ctx.indir, "input_original.png")) #λ = 0.1 #β = 0. @@ -201,12 +209,12 @@ function suite(::Path{(:convergence, :test)}, input, output) #noise_σ = 0.1 #f = clamp.(fo .+ noise_σ * randn(Float64, size(fo)), 0., 1.) - #saveimg(output("input_noisy.png"), f) + #saveimg(joinpath(ctx.outdir, "input_noisy.png"), f) #prob = DenoiseProblem(f; λ, β) - fo = f0 = loadimg(input("input_f0.png")) - f1 = loadimg(input("input_f1.png")) + fo = f0 = loadimg(joinpath(ctx.indir, "input_f0.png")) + f1 = loadimg(joinpath(ctx.indir, "input_f1.png")) λ = 0.002 β = 0.01 @@ -243,15 +251,15 @@ function suite(::Path{(:convergence, :test)}, input, output) end display(df) - CSV.write(output("energies.csv"), df) - #saveimg(output("output_glob.png"), fetch_u(states.glob)) - savedata(output("data.tex"); lambda=λ, beta=β, maxiters, + CSV.write(joinpath(ctx.outdir, "energies.csv"), df) + #saveimg(joinpath(ctx.outdir, "output_glob.png"), fetch_u(states.glob)) + savedata(ctx, "data.tex"; lambda=λ, beta=β, maxiters, width=size(fo, 2), height=size(fo, 1)) end -function suite(::Path{(:scaling, :opticalflow)}, input, output) - fo = f0 = loadimg(input("frame10.png")) - f1 = loadimg(input("frame11.png")) +function experiment_scaling_opticalflow(ctx) + fo = f0 = loadimg(joinpath(ctx.indir, "frame10.png")) + f1 = loadimg(joinpath(ctx.indir, "frame11.png")) d = 2 λ = 0.01 @@ -300,24 +308,21 @@ function suite(::Path{(:scaling, :opticalflow)}, input, output) display(df) - CSV.write(output("timings.csv"), df) - #saveimg(output("output_glob.png"), fetch_u(states.glob)) - savedata(output("data.tex"); lambda=λ, beta=β, Mdir, + CSV.write(joinpath(ctx.outdir, "timings.csv"), df) + #saveimg(joinpath(ctx.outdir, "output_glob.png"), fetch_u(states.glob)) + savedata(ctx, "data.tex"; lambda=λ, beta=β, Mdir, ntimings, stopenergy, ninner, width=size(fo, 2), height=size(fo, 1)) end -function prob_outerinner(input) -end - -suite(::Path{(:surrogate, :outerinner)}, input, output) = - _surrogate_outerinner(input, output, false) -suite(::Path{(:surrogate, :outerinner_ref)}, input, output) = - _surrogate_outerinner(input, output, true) +experiment_surrogate_outerinner(ctx) = + _experiment_outerinner(ctx, false) +experiment_surrogate_outerinner_ref(ctx) = + _experiment_outerinner(ctx, true) -function _surrogate_outerinner(input, output, ref) - fo = f0 = loadimg(input("frame10.png")) - f1 = loadimg(input("frame11.png")) +function _experiment_surrogate_outerinner(ctx, ref) + fo = f0 = loadimg(joinpath(ctx.indir, "frame10.png")) + f1 = loadimg(joinpath(ctx.indir, "frame11.png")) λ = 0.01 β = 0.001 @@ -360,18 +365,18 @@ function _surrogate_outerinner(input, output, ref) end display(df) - CSV.write(output("energies.csv"), df) - #saveimg(output("output_glob.png"), fetch_u(states.glob)) - savedata(output("data.tex"); lambda=λ, beta=β, minenergy_maxiters, maxiters, ninner, M, overlap, + CSV.write(joinpath(ctx.outdir, "energies.csv"), df) + #saveimg(joinpath(ctx.outdir, "output_glob.png"), fetch_u(states.glob)) + savedata(ctx, "data.tex"; lambda=λ, beta=β, minenergy_maxiters, maxiters, ninner, M, overlap, width=size(fo, 2), height=size(fo, 1)) end -function suite(::Path{(:convergence, :denoising)}, input, output) - fo = loadimg(input("input_original.png")) +function experiment_convergence_denoising(ctx) + fo = loadimg(joinpath(ctx.indir, "input_original.png")) λ = 0.1 β = 0. - maxiters = 10000 + maxiters = 100000 ninner = 100 M = (2,2) @@ -380,21 +385,21 @@ function suite(::Path{(:convergence, :denoising)}, input, output) noise_σ = 0.1 f = clamp.(fo .+ noise_σ * randn(Float64, size(fo)), 0., 1.) - saveimg(output("input_noisy.png"), f) + saveimg(joinpath(ctx.outdir, "input_noisy.png"), f) prob = DenoiseProblem(f; λ, β) τ = inv(8 * normB(prob)) df, states, energymin = compare_algs(prob; τ, M, overlap, maxiters, ninner) - CSV.write(output("energies.csv"), df) - saveimg(output("output_glob.png"), fetch_u(states.glob)) - savedata(output("data.tex"); lambda=λ, beta=β, tau=τ, maxiters, noise_sigma=noise_σ, energymin, + CSV.write(joinpath(ctx.outdir, "energies.csv"), df) + saveimg(joinpath(ctx.outdir, "output_glob.png"), fetch_u(states.glob)) + savedata(ctx, "data.tex"; lambda=λ, beta=β, tau=τ, maxiters, noise_sigma=noise_σ, energymin, width=size(fo, 2), height=size(fo, 1)) end -function suite(::Path{(:convergence, :inpainting)}, input, output) - fo = loadimg(input("input_original.png")) +function experiment_convergence_inpainting(ctx) + fo = loadimg(joinpath(ctx.indir, "input_original.png")) λ = 0.05 β = 0.001 @@ -407,21 +412,21 @@ function suite(::Path{(:convergence, :inpainting)}, input, output) f_mask = rand(Float64, size(fo)) .> 0.5 prob = InpaintProblem(fo, f_mask; λ, β) - saveimg(output("input_mask.png"), f_mask) - saveimg(output("input_g.png"), prob.g) + saveimg(joinpath(ctx.outdir, "input_mask.png"), f_mask) + saveimg(joinpath(ctx.outdir, "input_g.png"), prob.g) τ = inv(8 * normB(prob)) df, states, energymin = compare_algs(prob; τ, M, overlap, maxiters, ninner) - CSV.write(output("energies.csv"), df) - saveimg(output("output_glob.png"), fetch_u(states.glob)) - savedata(output("data.tex"); lambda=λ, beta=β, tau=τ, maxiters, energymin, + CSV.write(joinpath(ctx.outdir, "energies.csv"), df) + saveimg(joinpath(ctx.outdir, "output_glob.png"), fetch_u(states.glob)) + savedata(ctx, "data.tex"; lambda=λ, beta=β, tau=τ, maxiters, energymin, width=size(fo, 2), height=size(fo, 1)) end -function suite(::Path{(:convergence, :opticalflow)}, input, output) - f0 = loadimg(input("input_f0.png")) - f1 = loadimg(input("input_f1.png")) +function experiment_convergence_opticalflow(ctx) + f0 = loadimg(joinpath(ctx.indir, "input_f0.png")) + f1 = loadimg(joinpath(ctx.indir, "input_f1.png")) λ = 0.002 β = 0.001 @@ -437,13 +442,13 @@ function suite(::Path{(:convergence, :opticalflow)}, input, output) τ = inv(8 * normB(prob)) df, states, energymin = compare_algs(prob; τ, M, overlap, maxiters, ninner) - CSV.write(output("energies.csv"), df) + CSV.write(joinpath(ctx.outdir, "energies.csv"), df) cflow = colorflow(fetch_u(first(states)); maxflow=4.5/(584/48)) #p = plot(cflow); display(p) - save(output("flow.png"), cflow) + save(joinpath(ctx.outdir, "flow.png"), cflow) - savedata(output("data.tex"); lambda=λ, beta=β, tau=τ, maxiters, energymin, + savedata(ctx, "data.tex"; lambda=λ, beta=β, tau=τ, maxiters, energymin, width=size(f0, 2), height=size(f0, 1)) end @@ -548,9 +553,9 @@ end mdwt(x) = mdwt!(similar(x), x) imdwt(x) = imdwt!(similar(x), x) -function suite(::Path{(:global, :basic)}, input, output) - f = loadimg(input("input_original.png")) - #f = loadimg(input("frame10_small.png")) +function experiment_global_basic(ctx) + f = loadimg(joinpath(ctx.indir, "input_original.png")) + #f = loadimg(joinpath(ctx.indir, "frame10_small.png")) ax = axes(f) seed = 42 @@ -620,81 +625,21 @@ function suite(::Path{(:global, :basic)}, input, output) # df[!,Symbol(x)] .-= energymin #end - CSV.write(output("energies.csv"), df) + CSV.write(joinpath(ctx.outdir, "energies.csv"), df) u = fetch_u(states[1]) #display(u) p = plot(plot(toimg(f)), plot(toimg(u0)), plot(toimg(u))) - saveimg(output("input_orig.png"), f) - saveimg(output("input_g.png"), prob.g) - saveimg(output("output_u.png"), u) + saveimg(joinpath(ctx.outdir, "input_orig.png"), f) + saveimg(joinpath(ctx.outdir, "input_g.png"), prob.g) + saveimg(joinpath(ctx.outdir, "output_u.png"), u) display(p) - savedata(output("data.tex"); lambda=λ, beta=β, tau=τ, maxiters, ninner, + savedata(ctx, "data.tex"; lambda=λ, beta=β, tau=τ, maxiters, ninner, width=size(f, 2), height=size(f, 1)) return prob end - - -function halve(img) - all(iseven.(size(img))) || throw(ArgumentError("uneven size")) - - res = similar(img, size(img) .÷ 2) - fill!(res, zero(eltype(res))) - - for i in CartesianIndices(img) - j = CartesianIndex((Tuple(i) .+ 1) .÷ 2) - res[j] += img[i] - end - res ./= 2 ^ ndims(img) - - return res -end - - -""" - logfilter(dt; a=20) - -Reduce dataset such that the resulting dataset would have approximately -equidistant datapoints on a log-scale. `a` controls density. -""" -logfilter(dt; a=20) = filter(:k => k -> round(a*log(k+1)) - round(a*log(k)) > 0, dt) - -#function calcmin(f, alg) -# ctx = init(alg) -# fmin = f(ctx) -# while true -# step!(ctx) -# fcur = f(ctx) -# fcur >= fmin && break -# fmin = min(fmin, fcur) -# end -# return fmin -#end -# -#function seq(f; start, length) -# res = Vector{Float64}(undef, length) -# res[1] = f(1, start) -# for i in 2:length -# res[i] = f(i, res[i-1]) -# end -# return res -#end -# -#estmin(fk; p = 1) = estmin(axes(fk, 1), fk; p) -#function estmin(k, fk; p = 1, last=length(k)-ceil(Int, 10^(log10(length(k)) * (1-1/3)))) -# k = k[end-last+1:end] -# fk = fk[end-last+1:end] -# -# #res = optimize(x -> minimum(fk) .- x[1] <= 0 || x[2] <= 0 ? NaN : sum((log.(fk .- x[1]) .+ 1*log.(k) .+ log(x[2])).^2), [-Inf, nextfloat(0.)], [nextfloat(minimum(fk)), Inf], [minimum(fk)-1, 1.], Fminbox()) -# -# #return res.minimizer[1] -# -# A = hcat(ones(length(k)), (1 ./ k) .^ p) -# c0, c1 = A \ fk -# return c0 -#end diff --git a/scripts/util.jl b/scripts/util.jl index 36e1c57c2199f88c8cffbeedbe0de431b60e0098..4bcdf1d65cf1a85e4b6f1efc4593c7159a7742d1 100644 --- a/scripts/util.jl +++ b/scripts/util.jl @@ -1,50 +1,78 @@ module Util -using FileIO, CSV +export savedata -export Path, File, savedata, execute_all, execute_single +# Path Management -struct Path{T} end +""" + Context{P} -Base.print(io::IO, path::Path{T}) where T = write(io, joinpath(path...)) - -function Base.iterate(::Path{T}, state=1) where T - state > length(T) && return nothing - return string(T[state]), state + 1 +Execution context for an experiment. +""" +struct Context{P} + indir::String + outdir::String + params::P + # TODO: get rid of this when latex output does no longer depend on path + path::String end -struct File - root::String - path::Path - name::String +Context(root::String; params...) = Context(root, root, NamedTuple(params), "") +Context(inroot::String, outroot::String; params...) = + Context(inroot, outroot, NamedTuple(params), "") +Context(ctx::Context, path::String; params...) = + Context(joinpath(ctx.indir, path), joinpath(ctx.outdir, path), + merge(ctx.params, NamedTuple(params)), + joinpath(ctx.path, path)) + +""" + (ctx::Context)(f, subdir; params...) + +Execute experiment `f` on a context relative to `ctx` and `subdir` using +parameters `params`. +""" +function (ctx::Context)(f::Function, subdir::String; params...) + # maybe debug output with params? + subctx = Context(ctx, subdir; params...) + println("starting experiment `$(subctx.path)` ...") + f(subctx) end -function execute_all(suite, root) - for method in methods(suite) - path = method.sig.parameters[2]() - execute_single(suite, path, root) +# LaTeX Data Output + +# TODO: don't depend on ctx.path and use filename only +savedata(ctx::Context, filename; data...) = + open(joinpath(ctx.outdir, filename); write=true) do io + _savedata(io, ctx.path; data...) end -end -function execute_single(suite, path, root) - println("running `$(path)` ...") - input = x -> File(root, path, x) - output = x -> File(root, path, x) - suite(path, input, output) -end +function _savedata(io, path; data...) + isvalidname(x) = contains(string(x), r"^[^/\\]+$") + + # define tex command to access data + texcmd = "Data" + write(io, """ + \\providecommand{\\$(texcmd)}[1]{ + \\csname $(texcmd)/#1\\endcsname + } + """) -FileIO.load(file::File) = load(joinpath(file.root, file.path..., file.name)) -FileIO.save(file::File, x) = save(joinpath(file.root, file.path..., file.name), x) -CSV.write(file::File, x) = CSV.write(joinpath(file.root, file.path..., file.name), x) + for (key, value) in pairs(data) + isvalidname(key) && isvalidname(value) || + throw(ArgumentError("invalid key/value: $(key => value)")) -savedata(file::File; data...) = - open(joinpath(file.root, file.path..., file.name); write=true) do io - write_texdata(io, file.path; data...) + # actual data encoded as tex-commands + write(io, "\\expandafter\\def") + write(io, "\\csname $(texcmd)/$(path)/$(key)\\endcsname{") + show(io, MIME("text/latex"), value) + write(io, "}\n") end +end -isvalidname(x) = contains(string(x), r"^[^/\\]+$") +# LaTex special printing rules Base.show(io, ::MIME"text/latex", x) = print(io, x) + function Base.show(io::IO, ::MIME"text/latex", x::AbstractFloat) exponent = x == 0. ? 0 : floor(Int, log10(x)) if abs(exponent) <= 3 @@ -54,6 +82,7 @@ function Base.show(io::IO, ::MIME"text/latex", x::AbstractFloat) print(io, "\\ensuremath{", base, "\\cdot 10^{", exponent, "}}") end end + function Base.show(io::IO, ::MIME"text/latex", x::Integer) p = log10(x) pr = round(Int, p) @@ -64,25 +93,4 @@ function Base.show(io::IO, ::MIME"text/latex", x::Integer) end end -function write_texdata(io, path; data...) - texcmd = "Data" - # data access tex-command - write(io, """ - \\providecommand{\\$(texcmd)}[1]{ - \\csname $(texcmd)/#1\\endcsname - } - """) - - for (key, value) in pairs(data) - isvalidname(key) && isvalidname(value) || - throw(ArgumentError("invalid key/value: $(key => value)")) - - # actual data encoded as tex-commands - write(io, "\\expandafter\\def") - write(io, "\\csname $(texcmd)/$(join(path, "/"))/$(key)\\endcsname{") - show(io, MIME("text/latex"), value) - write(io, "}\n") - end -end - end diff --git a/src/common.jl b/src/common.jl index 9d0a1a0083c53c7766426fe788a6841e3d539baf..e7233c3ae5588fa4a2be0598f088783580fff95f 100644 --- a/src/common.jl +++ b/src/common.jl @@ -53,9 +53,6 @@ function fetch end fetch_u(st) = recover_u(fetch(st), st.algorithm.problem) -Base.intersect(a::CartesianIndices{d}, b::CartesianIndices{d}) where d = - CartesianIndices(intersect.(a.indices, b.indices)) - @generated function gradient(w::StaticKernels.Window{<:Real,N}) where N i0 = ntuple(_->0, N) i1(k) = ntuple(i->Int(k==i), N)