diff --git a/Project.toml b/Project.toml index 8ee58ba..3115c95 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "CalibrationErrors" uuid = "33913031-fe46-5864-950f-100836f47845" authors = ["David Widmann "] -version = "0.5.18" +version = "0.5.19" [deps] DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" @@ -16,7 +16,7 @@ UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed" [compat] DataStructures = "0.17, 0.18" Distances = "0.8.2, 0.9, 0.10" -KernelFunctions = "0.8.20, 0.9" +KernelFunctions = "0.10" Reexport = "0.2, 1.0" StatsBase = "0.32, 0.33" UnPack = "0.1, 1" diff --git a/docs/Manifest.toml b/docs/Manifest.toml index e952f94..be5878a 100644 --- a/docs/Manifest.toml +++ b/docs/Manifest.toml @@ -13,19 +13,19 @@ uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" deps = ["DataStructures", "Distances", "KernelFunctions", "LinearAlgebra", "Reexport", "Statistics", "StatsBase", "UnPack"] path = ".." uuid = "33913031-fe46-5864-950f-100836f47845" -version = "0.5.15" +version = "0.5.18" [[ChainRulesCore]] deps = ["Compat", "LinearAlgebra", "SparseArrays"] -git-tree-sha1 = "5402b5674b3068ca570771c11da9a57bfa70acd4" +git-tree-sha1 = "9b0375dc013ab0fc472b37cb8b18eed66b83f76b" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "0.9.39" +version = "0.9.43" [[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 = "ac4132ad78082518ec2037ae5770b6e796f7f956" +git-tree-sha1 = "0900bc19193b8e672d9cd477e6cd92d9e7c02f99" uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "3.27.0" +version = "3.29.0" [[CompilerSupportLibraries_jll]] deps = ["Artifacts", "Libdl"] @@ -56,10 +56,10 @@ deps = ["Mmap"] uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab" [[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"] @@ -117,9 +117,9 @@ version = "0.21.1" [[KernelFunctions]] deps = ["ChainRulesCore", "Compat", "CompositionsBase", "Distances", "FillArrays", "Functors", "LinearAlgebra", "Random", "Requires", "SpecialFunctions", "StatsBase", "StatsFuns", "TensorCore", "Test", "ZygoteRules"] -git-tree-sha1 = "e85205cee2ebf61ca8eeb1eae5b60b331f14114e" +git-tree-sha1 = "3c10a95f9ddd3f7b5c3ef462c2cb75bc58ec5b18" uuid = "ec8451be-7e33-11e9-00cf-bbf324bd1392" -version = "0.9.5" +version = "0.10.0" [[LibCURL]] deps = ["LibCURL_jll", "MozillaCACerts_jll"] @@ -195,9 +195,9 @@ uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e" version = "0.5.4+0" [[OrderedCollections]] -git-tree-sha1 = "4fa2ba51070ec13fcc7517db714445b4ab986bdf" +git-tree-sha1 = "85f8e6578bf1f9ee0d11e7bb1b1456435479d47c" uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" -version = "1.4.0" +version = "1.4.1" [[Parsers]] deps = ["Dates"] @@ -211,9 +211,9 @@ uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" [[Preferences]] deps = ["TOML"] -git-tree-sha1 = "ea79e4c9077208cd3bc5d29631a26bc0cff78902" +git-tree-sha1 = "00cfd92944ca9c760982747e9a1d0d5d86ab1e5a" uuid = "21216c6a-2e73-6563-6e65-726566657250" -version = "1.2.1" +version = "1.2.2" [[Printf]] deps = ["Unicode"] @@ -264,30 +264,35 @@ uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383" uuid = "6462fe0b-24de-5631-8697-dd941f90decc" [[SortingAlgorithms]] -deps = ["DataStructures", "Random", "Test"] -git-tree-sha1 = "03f5898c9959f8115e30bc7226ada7d0df554ddd" +deps = ["DataStructures"] +git-tree-sha1 = "2ec1962eba973f383239da22e75218565c390a96" uuid = "a2af1166-a08f-5f64-846c-94a0d3cef48c" -version = "0.3.1" +version = "1.0.0" [[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 = "9146da51b38e9705b9f5ccfadc3ab10a482cae36" uuid = "276daf66-3868-5448-9aa4-cd146d93841b" -version = "1.3.0" +version = "1.4.0" [[Statistics]] 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 = "4d8ca45223d7a28839e775d73a6f6b6b2ac64fd1" +deps = ["DataAPI", "DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"] +git-tree-sha1 = "2f6792d523d7448bbe2fec99eca9218f06cc746d" uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" -version = "0.33.6" +version = "0.33.8" [[StatsFuns]] deps = ["LogExpFunctions", "Rmath", "SpecialFunctions"] diff --git a/examples/classification/Manifest.toml b/examples/classification/Manifest.toml index 09bef04..9ec3df1 100644 --- a/examples/classification/Manifest.toml +++ b/examples/classification/Manifest.toml @@ -8,9 +8,9 @@ version = "1.0.1" [[AbstractPlotting]] deps = ["Animations", "ColorBrewer", "ColorSchemes", "ColorTypes", "Colors", "Contour", "Distributions", "DocStringExtensions", "FFMPEG", "FileIO", "FixedPointNumbers", "Formatting", "FreeType", "FreeTypeAbstraction", "GeometryBasics", "GridLayoutBase", "ImageIO", "IntervalSets", "Isoband", "KernelDensity", "LinearAlgebra", "Markdown", "Match", "Observables", "Packing", "PlotUtils", "PolygonOps", "Printf", "Random", "Serialization", "Showoff", "SignedDistanceFields", "SparseArrays", "StaticArrays", "Statistics", "StatsBase", "StructArrays", "UnicodeFun"] -git-tree-sha1 = "d778362f5f5b5a7efe4b2a7e01a34c0e08b94908" +git-tree-sha1 = "d494120dd73d880312bbc0d3ab5f1520046dcf37" uuid = "537997a7-5e4e-5d89-9595-2241ea00577e" -version = "0.15.27" +version = "0.18.2" [[Adapt]] deps = ["LinearAlgebra"] @@ -29,9 +29,9 @@ uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f" [[ArrayInterface]] deps = ["IfElse", "LinearAlgebra", "Requires", "SparseArrays", "Static"] -git-tree-sha1 = "2fbfa5f372352f92191b63976d070dc7195f47a4" +git-tree-sha1 = "b09fe16aa9dc587cccce838e6cb6d6e1f4831d7f" uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9" -version = "3.1.7" +version = "3.1.12" [[Artifacts]] uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" @@ -76,9 +76,9 @@ version = "1.0.5" [[CairoMakie]] deps = ["AbstractPlotting", "Cairo", "Colors", "FFTW", "FileIO", "FreeType", "GeometryBasics", "LinearAlgebra", "StaticArrays"] -git-tree-sha1 = "a87f1752847ed170f1dffc14778b9c590caf6aaf" +git-tree-sha1 = "83ee814a3048999e37e1894655e76eed0dcb350b" uuid = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0" -version = "0.3.19" +version = "0.4.7" [[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"] @@ -90,19 +90,13 @@ version = "1.16.0+6" deps = ["DataStructures", "Distances", "KernelFunctions", "LinearAlgebra", "Reexport", "Statistics", "StatsBase", "UnPack"] path = "../.." uuid = "33913031-fe46-5864-950f-100836f47845" -version = "0.5.15" - -[[CategoricalArrays]] -deps = ["DataAPI", "Future", "JSON", "Missings", "Printf", "Statistics", "StructTypes", "Unicode"] -git-tree-sha1 = "f4de3fab632544ff0a858f293755fe9aac0f47bf" -uuid = "324d7699-5711-5eae-9e2f-1d82baa6b597" -version = "0.9.6" +version = "0.5.18" [[ChainRulesCore]] deps = ["Compat", "LinearAlgebra", "SparseArrays"] -git-tree-sha1 = "5402b5674b3068ca570771c11da9a57bfa70acd4" +git-tree-sha1 = "9b0375dc013ab0fc472b37cb8b18eed66b83f76b" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "0.9.39" +version = "0.9.43" [[ColorBrewer]] deps = ["Colors", "JSON", "Test"] @@ -112,9 +106,9 @@ version = "0.4.0" [[ColorSchemes]] deps = ["ColorTypes", "Colors", "FixedPointNumbers", "Random", "StaticArrays"] -git-tree-sha1 = "9d7dfad1326b1ad29afa1366587806a14d727745" +git-tree-sha1 = "c8fd01e4b736013bc61b704871d20503b33ea402" uuid = "35d6a980-a343-548e-a6ea-1d62b119f2f4" -version = "3.12.0" +version = "3.12.1" [[ColorTypes]] deps = ["FixedPointNumbers", "Random"] @@ -123,22 +117,22 @@ uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" version = "0.10.12" [[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", "Reexport"] -git-tree-sha1 = "82f4e6ff9f847eca3e5ebc666ea2cd7b48e8b47e" +git-tree-sha1 = "417b0ed7b8b838aa6ca0a87aadf1bb9eb111ce40" uuid = "5ae59095-9a9b-59fe-a467-6f913c188581" -version = "0.12.7" +version = "0.12.8" [[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 = "ac4132ad78082518ec2037ae5770b6e796f7f956" +git-tree-sha1 = "0900bc19193b8e672d9cd477e6cd92d9e7c02f99" uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "3.27.0" +version = "3.29.0" [[CompilerSupportLibraries_jll]] deps = ["Artifacts", "Libdl"] @@ -172,10 +166,10 @@ uuid = "124859b0-ceae-595e-8997-d05f6a7a8dfe" version = "0.7.7" [[DataFrames]] -deps = ["CategoricalArrays", "Compat", "DataAPI", "Future", "InvertedIndices", "IteratorInterfaceExtensions", "LinearAlgebra", "Markdown", "Missings", "PooledArrays", "PrettyTables", "Printf", "REPL", "Reexport", "SortingAlgorithms", "Statistics", "TableTraits", "Tables", "Unicode"] -git-tree-sha1 = "d50972453ef464ddcebdf489d11885468b7b83a3" +deps = ["Compat", "DataAPI", "Future", "InvertedIndices", "IteratorInterfaceExtensions", "LinearAlgebra", "Markdown", "Missings", "PooledArrays", "PrettyTables", "Printf", "REPL", "Reexport", "SortingAlgorithms", "Statistics", "TableTraits", "Tables", "Unicode"] +git-tree-sha1 = "66ee4fe515a9294a8836ef18eea7239c6ac3db5e" uuid = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" -version = "0.22.7" +version = "1.1.1" [[DataStructures]] deps = ["Compat", "InteractiveUtils", "OrderedCollections"] @@ -203,10 +197,10 @@ deps = ["Mmap"] uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab" [[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"] @@ -242,9 +236,9 @@ 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" [[FFMPEG]] deps = ["FFMPEG_jll", "x264_jll"] @@ -260,9 +254,9 @@ version = "4.3.1+4" [[FFTW]] deps = ["AbstractFFTs", "FFTW_jll", "LinearAlgebra", "MKL_jll", "Preferences", "Reexport"] -git-tree-sha1 = "1dc6ca6ad69eb9beadd3ce82b90910f4fa63d7c3" +git-tree-sha1 = "746f68839306977040653ebbd249e39c15420b8a" uuid = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341" -version = "1.4.0" +version = "1.4.1" [[FFTW_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -272,9 +266,9 @@ version = "3.3.9+7" [[FileIO]] deps = ["Pkg", "Requires", "UUIDs"] -git-tree-sha1 = "b647ed22f176a4f12eabe2afd90d19a95af2e8ca" +git-tree-sha1 = "cfb694feaddf4f0381ef3cc9d4c0d8fc6b7e2ea7" uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" -version = "1.8.0" +version = "1.9.0" [[FillArrays]] deps = ["LinearAlgebra", "Random", "SparseArrays"] @@ -302,9 +296,9 @@ version = "0.4.2" [[FreeType]] deps = ["CEnum", "FreeType2_jll"] -git-tree-sha1 = "d5e296dea44f9cfb8cc83681aa3db367e0cbfd4f" +git-tree-sha1 = "cabd77ab6a6fdff49bfd24af2ebe76e6e018a2b4" uuid = "b38be410-82b0-50bf-ab77-7b57e271db43" -version = "3.0.1" +version = "4.0.0" [[FreeType2_jll]] deps = ["Artifacts", "Bzip2_jll", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"] @@ -314,9 +308,9 @@ version = "2.10.1+5" [[FreeTypeAbstraction]] deps = ["ColorVectorSpace", "Colors", "FreeType", "GeometryBasics", "StaticArrays"] -git-tree-sha1 = "3d955cfbefd6645ced60091d8c9bfcc96fc32345" +git-tree-sha1 = "d51e69f0a2f8a3842bca4183b700cf3d9acce626" uuid = "663a7486-cb36-511b-a19d-713bb74d65c9" -version = "0.8.4" +version = "0.9.1" [[FriBidi_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -371,15 +365,15 @@ uuid = "3955a311-db13-416c-9275-1d80ed98e5e9" version = "0.5.4" [[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", "NetworkOptions", "Sockets", "URIs"] -git-tree-sha1 = "c9f380c76d8aaa1fa7ea9cf97bddbc0d5b15adc2" +git-tree-sha1 = "b855bf8247d6e946c75bb30f593bfe7fe591058d" uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" -version = "0.9.5" +version = "0.9.8" [[HarfBuzz_jll]] deps = ["Artifacts", "Cairo_jll", "Fontconfig_jll", "FreeType2_jll", "Gettext_jll", "Glib_jll", "Graphite2_jll", "ICU_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Pkg"] @@ -399,16 +393,16 @@ uuid = "615f187c-cbe4-4ef1-ba3b-2fcf58d6d173" version = "0.1.0" [[ImageCore]] -deps = ["AbstractFFTs", "Colors", "FixedPointNumbers", "Graphics", "MappedArrays", "MosaicViews", "OffsetArrays", "PaddedViews", "Reexport"] -git-tree-sha1 = "db645f20b59f060d8cfae696bc9538d13fd86416" +deps = ["AbstractFFTs", "ColorVectorSpace", "Colors", "FixedPointNumbers", "Graphics", "MappedArrays", "MosaicViews", "OffsetArrays", "PaddedViews", "Reexport"] +git-tree-sha1 = "8aa4a5c9b0b0a0fea9cac59549222078e375b867" uuid = "a09fc81d-aa75-5fe9-8630-4744c3626534" -version = "0.8.22" +version = "0.9.0" [[ImageIO]] deps = ["FileIO", "Netpbm", "PNGFiles", "TiffImages", "UUIDs"] -git-tree-sha1 = "015adb094b2d81167821df8a24c180a8eee22f2c" +git-tree-sha1 = "d444375fd1e45153fe339c259da8bf98eb5130d6" uuid = "82e4d734-157c-48bb-816b-45c225c6df19" -version = "0.5.3" +version = "0.5.4" [[IndirectArrays]] git-tree-sha1 = "c2a145a145dc03a7620af1444e0264ef907bd44f" @@ -485,15 +479,15 @@ version = "0.21.1" [[KernelDensity]] deps = ["Distributions", "DocStringExtensions", "FFTW", "Interpolations", "StatsBase"] -git-tree-sha1 = "09aeec87bdc9c1fa70d0b508dfa94a21acd280d9" +git-tree-sha1 = "591e8dc09ad18386189610acafb970032c519707" uuid = "5ab0869b-81aa-558d-bb23-cbf5423bbe9b" -version = "0.6.2" +version = "0.6.3" [[KernelFunctions]] deps = ["ChainRulesCore", "Compat", "CompositionsBase", "Distances", "FillArrays", "Functors", "LinearAlgebra", "Random", "Requires", "SpecialFunctions", "StatsBase", "StatsFuns", "TensorCore", "Test", "ZygoteRules"] -git-tree-sha1 = "baf064f6f57116aa63ac6268cccd5088eaf21ac5" +git-tree-sha1 = "3c10a95f9ddd3f7b5c3ef462c2cb75bc58ec5b18" uuid = "ec8451be-7e33-11e9-00cf-bbf324bd1392" -version = "0.9.4" +version = "0.10.0" [[LAME_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -568,9 +562,9 @@ version = "2.34.0+3" [[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" [[LinearAlgebra]] deps = ["Libdl"] @@ -645,10 +639,10 @@ uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" version = "0.3.5" [[Netpbm]] -deps = ["ColorVectorSpace", "FileIO", "ImageCore"] -git-tree-sha1 = "09589171688f0039f13ebe0fdcc7288f50228b52" +deps = ["FileIO", "ImageCore"] +git-tree-sha1 = "18efc06f6ec36a8b801b23f076e3c6ac7c3bf153" uuid = "f09324ee-3d7c-5217-9330-fc30815ba969" -version = "1.0.1" +version = "1.0.2" [[NetworkOptions]] uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" @@ -660,9 +654,9 @@ version = "0.4.0" [[OffsetArrays]] deps = ["Adapt"] -git-tree-sha1 = "87a728aebb76220bd72855e1c85284c5fdb9774c" +git-tree-sha1 = "47b443d2ccc8297a4c538f55f8fd828ad58599ab" uuid = "6fe1bfb0-de20-5000-8ca7-80f57d26f881" -version = "1.7.0" +version = "1.8.0" [[Ogg_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -689,9 +683,9 @@ uuid = "91d4177d-7536-5919-b921-800302f37372" version = "1.3.1+3" [[OrderedCollections]] -git-tree-sha1 = "4fa2ba51070ec13fcc7517db714445b4ab986bdf" +git-tree-sha1 = "85f8e6578bf1f9ee0d11e7bb1b1456435479d47c" uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" -version = "1.4.0" +version = "1.4.1" [[PCRE_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -776,15 +770,15 @@ version = "1.2.1" [[Preferences]] deps = ["TOML"] -git-tree-sha1 = "ea79e4c9077208cd3bc5d29631a26bc0cff78902" +git-tree-sha1 = "00cfd92944ca9c760982747e9a1d0d5d86ab1e5a" uuid = "21216c6a-2e73-6563-6e65-726566657250" -version = "1.2.1" +version = "1.2.2" [[PrettyTables]] deps = ["Crayons", "Formatting", "Markdown", "Reexport", "Tables"] -git-tree-sha1 = "574a6b3ea95f04e8757c0280bb9c29f1a5e35138" +git-tree-sha1 = "b60494adf99652d220cdef46f8a32232182cc22d" uuid = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d" -version = "0.11.1" +version = "1.0.1" [[Printf]] deps = ["Unicode"] @@ -792,9 +786,9 @@ uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" [[ProgressMeter]] deps = ["Distributed", "Printf"] -git-tree-sha1 = "6e9c89cba09f6ef134b00e10625590746ba1e036" +git-tree-sha1 = "1be8800271c86f572d334fef6e3b8364eaece7d9" uuid = "92933f4c-e287-5a05-a399-4b506db050ca" -version = "1.5.0" +version = "1.6.2" [[QuadGK]] deps = ["DataStructures", "LinearAlgebra"] @@ -868,9 +862,9 @@ 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" [[SignedDistanceFields]] deps = ["Random", "Statistics", "Test"] @@ -882,20 +876,20 @@ version = "0.4.0" uuid = "6462fe0b-24de-5631-8697-dd941f90decc" [[SortingAlgorithms]] -deps = ["DataStructures", "Random", "Test"] -git-tree-sha1 = "03f5898c9959f8115e30bc7226ada7d0df554ddd" +deps = ["DataStructures"] +git-tree-sha1 = "2ec1962eba973f383239da22e75218565c390a96" uuid = "a2af1166-a08f-5f64-846c-94a0d3cef48c" -version = "0.3.1" +version = "1.0.0" [[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 = "9146da51b38e9705b9f5ccfadc3ab10a482cae36" uuid = "276daf66-3868-5448-9aa4-cd146d93841b" -version = "1.3.0" +version = "1.4.0" [[StackViews]] deps = ["OffsetArrays"] @@ -911,19 +905,24 @@ version = "0.2.4" [[StaticArrays]] deps = ["LinearAlgebra", "Random", "Statistics"] -git-tree-sha1 = "e8cd1b100d37f5b4cfd2c83f45becf61c762eaf7" +git-tree-sha1 = "c635017268fd51ed944ec429bcc4ad010bcea900" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "1.1.1" +version = "1.2.0" [[Statistics]] 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 = "4d8ca45223d7a28839e775d73a6f6b6b2ac64fd1" +deps = ["DataAPI", "DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"] +git-tree-sha1 = "2f6792d523d7448bbe2fec99eca9218f06cc746d" uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" -version = "0.33.6" +version = "0.33.8" [[StatsFuns]] deps = ["LogExpFunctions", "Rmath", "SpecialFunctions"] @@ -937,12 +936,6 @@ git-tree-sha1 = "44b3afd37b17422a62aea25f04c1f7e09ce6b07f" uuid = "09ab397b-f2b6-538f-b94a-2f83cf4a842a" version = "0.5.1" -[[StructTypes]] -deps = ["Dates", "UUIDs"] -git-tree-sha1 = "e36adc471280e8b346ea24c5c87ba0571204be7a" -uuid = "856f2bd8-1eba-4b0a-8007-ebc267875bd4" -version = "1.7.2" - [[SuiteSparse]] deps = ["Libdl", "LinearAlgebra", "Serialization", "SparseArrays"] uuid = "4607b0f0-06f3-5cda-b6b1-a6196a1729e9" @@ -991,14 +984,14 @@ uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [[TiffImages]] deps = ["ColorTypes", "DocStringExtensions", "FileIO", "FixedPointNumbers", "IndirectArrays", "OffsetArrays", "OrderedCollections", "PkgVersion", "ProgressMeter"] -git-tree-sha1 = "5c40c59956e873af583b8b831a877b81d49a1c9f" +git-tree-sha1 = "af30d22cc2cdda1848821135bfb04ebd657005a2" uuid = "731e570b-9d59-4bfa-96dc-6df516fadf69" -version = "0.3.1" +version = "0.3.2" [[URIs]] -git-tree-sha1 = "7855809b88d7b16e9b029afd17880930626f54a2" +git-tree-sha1 = "97bbe755a53fe859669cd907f2d96aee8d2c1355" uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4" -version = "1.2.0" +version = "1.3.0" [[UUIDs]] deps = ["Random", "SHA"] diff --git a/examples/classification/script.jl b/examples/classification/script.jl index 9e704af..3e9cb38 100644 --- a/examples/classification/script.jl +++ b/examples/classification/script.jl @@ -170,10 +170,10 @@ val_predict = predict_naive_bayes_classifier(penguins_fit, val_penguins); # corresponding vector of predictions. train_species = convert(Vector{Int}, indexin(train_penguins.species, names(train_predict))) -train_probs = collect(Vector{Float64}, eachrow(train_predict)) +train_probs = RowVecs(Matrix{Float64}(train_predict)) val_species = convert(Vector{Int}, indexin(val_penguins.species, names(val_predict))) -val_probs = collect(Vector{Float64}, eachrow(val_predict)); +val_probs = RowVecs(Matrix{Float64}(val_predict)); # ### Log-likelihood # diff --git a/examples/distribution/Manifest.toml b/examples/distribution/Manifest.toml index 36d9d7b..635d3e1 100644 --- a/examples/distribution/Manifest.toml +++ b/examples/distribution/Manifest.toml @@ -8,9 +8,9 @@ version = "1.0.1" [[AbstractPlotting]] deps = ["Animations", "ColorBrewer", "ColorSchemes", "ColorTypes", "Colors", "Contour", "Distributions", "DocStringExtensions", "FFMPEG", "FileIO", "FixedPointNumbers", "Formatting", "FreeType", "FreeTypeAbstraction", "GeometryBasics", "GridLayoutBase", "ImageIO", "IntervalSets", "Isoband", "KernelDensity", "LinearAlgebra", "Markdown", "Match", "Observables", "Packing", "PlotUtils", "PolygonOps", "Printf", "Random", "Serialization", "Showoff", "SignedDistanceFields", "SparseArrays", "StaticArrays", "Statistics", "StatsBase", "StructArrays", "UnicodeFun"] -git-tree-sha1 = "d778362f5f5b5a7efe4b2a7e01a34c0e08b94908" +git-tree-sha1 = "d494120dd73d880312bbc0d3ab5f1520046dcf37" uuid = "537997a7-5e4e-5d89-9595-2241ea00577e" -version = "0.15.27" +version = "0.18.2" [[Adapt]] deps = ["LinearAlgebra"] @@ -29,9 +29,9 @@ uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f" [[ArrayInterface]] deps = ["IfElse", "LinearAlgebra", "Requires", "SparseArrays", "Static"] -git-tree-sha1 = "2fbfa5f372352f92191b63976d070dc7195f47a4" +git-tree-sha1 = "b09fe16aa9dc587cccce838e6cb6d6e1f4831d7f" uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9" -version = "3.1.7" +version = "3.1.12" [[Artifacts]] uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" @@ -64,9 +64,9 @@ version = "1.0.5" [[CairoMakie]] deps = ["AbstractPlotting", "Cairo", "Colors", "FFTW", "FileIO", "FreeType", "GeometryBasics", "LinearAlgebra", "StaticArrays"] -git-tree-sha1 = "a87f1752847ed170f1dffc14778b9c590caf6aaf" +git-tree-sha1 = "83ee814a3048999e37e1894655e76eed0dcb350b" uuid = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0" -version = "0.3.19" +version = "0.4.7" [[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"] @@ -78,13 +78,13 @@ version = "1.16.0+6" deps = ["DataStructures", "Distances", "KernelFunctions", "LinearAlgebra", "Reexport", "Statistics", "StatsBase", "UnPack"] path = "../.." uuid = "33913031-fe46-5864-950f-100836f47845" -version = "0.5.15" +version = "0.5.18" [[ChainRulesCore]] deps = ["Compat", "LinearAlgebra", "SparseArrays"] -git-tree-sha1 = "5402b5674b3068ca570771c11da9a57bfa70acd4" +git-tree-sha1 = "9b0375dc013ab0fc472b37cb8b18eed66b83f76b" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "0.9.39" +version = "0.9.43" [[ColorBrewer]] deps = ["Colors", "JSON", "Test"] @@ -94,9 +94,9 @@ version = "0.4.0" [[ColorSchemes]] deps = ["ColorTypes", "Colors", "FixedPointNumbers", "Random", "StaticArrays"] -git-tree-sha1 = "9d7dfad1326b1ad29afa1366587806a14d727745" +git-tree-sha1 = "c8fd01e4b736013bc61b704871d20503b33ea402" uuid = "35d6a980-a343-548e-a6ea-1d62b119f2f4" -version = "3.12.0" +version = "3.12.1" [[ColorTypes]] deps = ["FixedPointNumbers", "Random"] @@ -105,22 +105,22 @@ uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" version = "0.10.12" [[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", "Reexport"] -git-tree-sha1 = "82f4e6ff9f847eca3e5ebc666ea2cd7b48e8b47e" +git-tree-sha1 = "417b0ed7b8b838aa6ca0a87aadf1bb9eb111ce40" uuid = "5ae59095-9a9b-59fe-a467-6f913c188581" -version = "0.12.7" +version = "0.12.8" [[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 = "ac4132ad78082518ec2037ae5770b6e796f7f956" +git-tree-sha1 = "0900bc19193b8e672d9cd477e6cd92d9e7c02f99" uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "3.27.0" +version = "3.29.0" [[CompilerSupportLibraries_jll]] deps = ["Artifacts", "Libdl"] @@ -162,10 +162,10 @@ deps = ["Mmap"] uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab" [[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"] @@ -201,9 +201,9 @@ 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" [[FFMPEG]] deps = ["FFMPEG_jll", "x264_jll"] @@ -219,9 +219,9 @@ version = "4.3.1+4" [[FFTW]] deps = ["AbstractFFTs", "FFTW_jll", "LinearAlgebra", "MKL_jll", "Preferences", "Reexport"] -git-tree-sha1 = "1dc6ca6ad69eb9beadd3ce82b90910f4fa63d7c3" +git-tree-sha1 = "746f68839306977040653ebbd249e39c15420b8a" uuid = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341" -version = "1.4.0" +version = "1.4.1" [[FFTW_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -231,9 +231,9 @@ version = "3.3.9+7" [[FileIO]] deps = ["Pkg", "Requires", "UUIDs"] -git-tree-sha1 = "b647ed22f176a4f12eabe2afd90d19a95af2e8ca" +git-tree-sha1 = "cfb694feaddf4f0381ef3cc9d4c0d8fc6b7e2ea7" uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" -version = "1.8.0" +version = "1.9.0" [[FillArrays]] deps = ["LinearAlgebra", "Random", "SparseArrays"] @@ -261,9 +261,9 @@ version = "0.4.2" [[FreeType]] deps = ["CEnum", "FreeType2_jll"] -git-tree-sha1 = "d5e296dea44f9cfb8cc83681aa3db367e0cbfd4f" +git-tree-sha1 = "cabd77ab6a6fdff49bfd24af2ebe76e6e018a2b4" uuid = "b38be410-82b0-50bf-ab77-7b57e271db43" -version = "3.0.1" +version = "4.0.0" [[FreeType2_jll]] deps = ["Artifacts", "Bzip2_jll", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"] @@ -273,9 +273,9 @@ version = "2.10.1+5" [[FreeTypeAbstraction]] deps = ["ColorVectorSpace", "Colors", "FreeType", "GeometryBasics", "StaticArrays"] -git-tree-sha1 = "3d955cfbefd6645ced60091d8c9bfcc96fc32345" +git-tree-sha1 = "d51e69f0a2f8a3842bca4183b700cf3d9acce626" uuid = "663a7486-cb36-511b-a19d-713bb74d65c9" -version = "0.8.4" +version = "0.9.1" [[FriBidi_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -326,9 +326,9 @@ uuid = "3955a311-db13-416c-9275-1d80ed98e5e9" version = "0.5.4" [[Grisu]] -git-tree-sha1 = "03d381f65183cb2d0af8b3425fde97263ce9a995" +git-tree-sha1 = "53bb909d1151e57e2484c3d1b53e19552b887fb2" uuid = "42e2da0e-8278-4e71-bc24-59509adca0fe" -version = "1.0.0" +version = "1.0.2" [[HarfBuzz_jll]] deps = ["Artifacts", "Cairo_jll", "Fontconfig_jll", "FreeType2_jll", "Gettext_jll", "Glib_jll", "Graphite2_jll", "ICU_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Pkg"] @@ -348,16 +348,16 @@ uuid = "615f187c-cbe4-4ef1-ba3b-2fcf58d6d173" version = "0.1.0" [[ImageCore]] -deps = ["AbstractFFTs", "Colors", "FixedPointNumbers", "Graphics", "MappedArrays", "MosaicViews", "OffsetArrays", "PaddedViews", "Reexport"] -git-tree-sha1 = "db645f20b59f060d8cfae696bc9538d13fd86416" +deps = ["AbstractFFTs", "ColorVectorSpace", "Colors", "FixedPointNumbers", "Graphics", "MappedArrays", "MosaicViews", "OffsetArrays", "PaddedViews", "Reexport"] +git-tree-sha1 = "8aa4a5c9b0b0a0fea9cac59549222078e375b867" uuid = "a09fc81d-aa75-5fe9-8630-4744c3626534" -version = "0.8.22" +version = "0.9.0" [[ImageIO]] deps = ["FileIO", "Netpbm", "PNGFiles", "TiffImages", "UUIDs"] -git-tree-sha1 = "015adb094b2d81167821df8a24c180a8eee22f2c" +git-tree-sha1 = "d444375fd1e45153fe339c259da8bf98eb5130d6" uuid = "82e4d734-157c-48bb-816b-45c225c6df19" -version = "0.5.3" +version = "0.5.4" [[IndirectArrays]] git-tree-sha1 = "c2a145a145dc03a7620af1444e0264ef907bd44f" @@ -416,15 +416,15 @@ version = "0.21.1" [[KernelDensity]] deps = ["Distributions", "DocStringExtensions", "FFTW", "Interpolations", "StatsBase"] -git-tree-sha1 = "09aeec87bdc9c1fa70d0b508dfa94a21acd280d9" +git-tree-sha1 = "591e8dc09ad18386189610acafb970032c519707" uuid = "5ab0869b-81aa-558d-bb23-cbf5423bbe9b" -version = "0.6.2" +version = "0.6.3" [[KernelFunctions]] deps = ["ChainRulesCore", "Compat", "CompositionsBase", "Distances", "FillArrays", "Functors", "LinearAlgebra", "Random", "Requires", "SpecialFunctions", "StatsBase", "StatsFuns", "TensorCore", "Test", "ZygoteRules"] -git-tree-sha1 = "baf064f6f57116aa63ac6268cccd5088eaf21ac5" +git-tree-sha1 = "3c10a95f9ddd3f7b5c3ef462c2cb75bc58ec5b18" uuid = "ec8451be-7e33-11e9-00cf-bbf324bd1392" -version = "0.9.4" +version = "0.10.0" [[LAME_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -499,9 +499,9 @@ version = "2.34.0+3" [[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" [[LinearAlgebra]] deps = ["Libdl"] @@ -570,10 +570,10 @@ uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" version = "0.3.5" [[Netpbm]] -deps = ["ColorVectorSpace", "FileIO", "ImageCore"] -git-tree-sha1 = "09589171688f0039f13ebe0fdcc7288f50228b52" +deps = ["FileIO", "ImageCore"] +git-tree-sha1 = "18efc06f6ec36a8b801b23f076e3c6ac7c3bf153" uuid = "f09324ee-3d7c-5217-9330-fc30815ba969" -version = "1.0.1" +version = "1.0.2" [[NetworkOptions]] uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" @@ -585,9 +585,9 @@ version = "0.4.0" [[OffsetArrays]] deps = ["Adapt"] -git-tree-sha1 = "87a728aebb76220bd72855e1c85284c5fdb9774c" +git-tree-sha1 = "47b443d2ccc8297a4c538f55f8fd828ad58599ab" uuid = "6fe1bfb0-de20-5000-8ca7-80f57d26f881" -version = "1.7.0" +version = "1.8.0" [[Ogg_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -614,9 +614,9 @@ uuid = "91d4177d-7536-5919-b921-800302f37372" version = "1.3.1+3" [[OrderedCollections]] -git-tree-sha1 = "4fa2ba51070ec13fcc7517db714445b4ab986bdf" +git-tree-sha1 = "85f8e6578bf1f9ee0d11e7bb1b1456435479d47c" uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" -version = "1.4.0" +version = "1.4.1" [[PCRE_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -689,9 +689,9 @@ version = "0.1.1" [[Preferences]] deps = ["TOML"] -git-tree-sha1 = "ea79e4c9077208cd3bc5d29631a26bc0cff78902" +git-tree-sha1 = "00cfd92944ca9c760982747e9a1d0d5d86ab1e5a" uuid = "21216c6a-2e73-6563-6e65-726566657250" -version = "1.2.1" +version = "1.2.2" [[Printf]] deps = ["Unicode"] @@ -699,9 +699,9 @@ uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" [[ProgressMeter]] deps = ["Distributed", "Printf"] -git-tree-sha1 = "6e9c89cba09f6ef134b00e10625590746ba1e036" +git-tree-sha1 = "1be8800271c86f572d334fef6e3b8364eaece7d9" uuid = "92933f4c-e287-5a05-a399-4b506db050ca" -version = "1.5.0" +version = "1.6.2" [[QuadGK]] deps = ["DataStructures", "LinearAlgebra"] @@ -757,9 +757,9 @@ 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" [[SignedDistanceFields]] deps = ["Random", "Statistics", "Test"] @@ -771,20 +771,20 @@ version = "0.4.0" uuid = "6462fe0b-24de-5631-8697-dd941f90decc" [[SortingAlgorithms]] -deps = ["DataStructures", "Random", "Test"] -git-tree-sha1 = "03f5898c9959f8115e30bc7226ada7d0df554ddd" +deps = ["DataStructures"] +git-tree-sha1 = "2ec1962eba973f383239da22e75218565c390a96" uuid = "a2af1166-a08f-5f64-846c-94a0d3cef48c" -version = "0.3.1" +version = "1.0.0" [[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 = "9146da51b38e9705b9f5ccfadc3ab10a482cae36" uuid = "276daf66-3868-5448-9aa4-cd146d93841b" -version = "1.3.0" +version = "1.4.0" [[StackViews]] deps = ["OffsetArrays"] @@ -800,19 +800,24 @@ version = "0.2.4" [[StaticArrays]] deps = ["LinearAlgebra", "Random", "Statistics"] -git-tree-sha1 = "e8cd1b100d37f5b4cfd2c83f45becf61c762eaf7" +git-tree-sha1 = "c635017268fd51ed944ec429bcc4ad010bcea900" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "1.1.1" +version = "1.2.0" [[Statistics]] 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 = "4d8ca45223d7a28839e775d73a6f6b6b2ac64fd1" +deps = ["DataAPI", "DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"] +git-tree-sha1 = "2f6792d523d7448bbe2fec99eca9218f06cc746d" uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" -version = "0.33.6" +version = "0.33.8" [[StatsFuns]] deps = ["LogExpFunctions", "Rmath", "SpecialFunctions"] @@ -862,9 +867,9 @@ uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [[TiffImages]] deps = ["ColorTypes", "DocStringExtensions", "FileIO", "FixedPointNumbers", "IndirectArrays", "OffsetArrays", "OrderedCollections", "PkgVersion", "ProgressMeter"] -git-tree-sha1 = "5c40c59956e873af583b8b831a877b81d49a1c9f" +git-tree-sha1 = "af30d22cc2cdda1848821135bfb04ebd657005a2" uuid = "731e570b-9d59-4bfa-96dc-6df516fadf69" -version = "0.3.1" +version = "0.3.2" [[UUIDs]] deps = ["Random", "SHA"] diff --git a/examples/distribution/script.jl b/examples/distribution/script.jl index c648b13..bf0fdba 100644 --- a/examples/distribution/script.jl +++ b/examples/distribution/script.jl @@ -195,7 +195,10 @@ function (f::MedianHeuristicKernel)((predictions, targets)) γ = inv(median!(cache)) ## create tensor product kernel - return transform(TVExponentialKernel(), γ) ⊗ WhiteKernel() + kernel_predictions = ExponentialKernel(; metric=TotalVariation()) ∘ ScaleTransform(γ) + kernel_targets = WhiteKernel() + + return kernel_predictions ⊗ kernel_targets end #md nothing #hide diff --git a/src/CalibrationErrors.jl b/src/CalibrationErrors.jl index aebefeb..28a891f 100644 --- a/src/CalibrationErrors.jl +++ b/src/CalibrationErrors.jl @@ -20,16 +20,12 @@ export ECE, BiasedSKCE, UnbiasedSKCE, BlockUnbiasedSKCE, UCME # binning algorithms export UniformBinning, MedianVarianceBinning -# kernels -export TVExponentialKernel - include("generic.jl") include("binning/generic.jl") include("binning/uniform.jl") include("binning/medianvariance.jl") include("ece.jl") -include("kernels.jl") include("skce/generic.jl") include("skce/biased.jl") include("skce/unbiased.jl") diff --git a/src/deprecated.jl b/src/deprecated.jl index d6a9cbf..65268cb 100644 --- a/src/deprecated.jl +++ b/src/deprecated.jl @@ -36,3 +36,5 @@ @deprecate unbiasedskce(kernel, predictions, targets) UnbiasedSKCE(kernel)( predictions, targets ) false + +@deprecate TVExponentialKernel() ExponentialKernel(; metric=TotalVariation()) diff --git a/src/kernels.jl b/src/kernels.jl deleted file mode 100644 index ddcdb22..0000000 --- a/src/kernels.jl +++ /dev/null @@ -1,10 +0,0 @@ -# exponential kernel with total variation distance -struct TVExponentialKernel <: KernelFunctions.SimpleKernel end - -KernelFunctions.kappa(kernel::TVExponentialKernel, d) = exp(-d) -KernelFunctions.metric(::TVExponentialKernel) = TotalVariation() - -# Simplifies computations of distances but is type piracy... :( -function KernelFunctions._scale(t::ScaleTransform, metric::TotalVariation, x, y) - return first(t.s) * evaluate(metric, x, y) -end diff --git a/test/deprecated.jl b/test/deprecated.jl index eb7fbe1..b5798b5 100644 --- a/test/deprecated.jl +++ b/test/deprecated.jl @@ -143,4 +143,9 @@ CalibrationErrors.unbiasedskce(kernel, predictions, targets) ) == UnbiasedSKCE(kernel)(predictions, targets) end + + @testset "TVExponentialKernel" begin + kernel = @test_deprecated(TVExponentialKernel()) + @test kernel isa ExponentialKernel{TotalVariation} + end end diff --git a/test/kernels.jl b/test/kernels.jl deleted file mode 100644 index 9469850..0000000 --- a/test/kernels.jl +++ /dev/null @@ -1,15 +0,0 @@ -@testset "kernels.jl" begin - kernel = TVExponentialKernel() - - # traits - @test KernelFunctions.metric(kernel) === TotalVariation() - - # simple evaluation - x, y = rand(10), rand(10) - @test kernel(x, y) == exp(-totalvariation(x, y)) - - # transformations - @test (kernel ∘ ScaleTransform(0.1))(x, y) == exp(-0.1 * totalvariation(x, y)) - ard = rand(10) - @test (kernel ∘ ARDTransform(ard))(x, y) == exp(-totalvariation(ard .* x, ard .* y)) -end diff --git a/test/runtests.jl b/test/runtests.jl index ac63a64..90c1ad3 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -29,10 +29,6 @@ Random.seed!(1234) include("ece.jl") end - @testset "Kernels" begin - include("kernels.jl") - end - @testset "SKCE" begin @testset "generic" begin include("skce/generic.jl")