diff --git a/scripts/Manifest.toml b/scripts/Manifest.toml index 53a778d6a5eaf28aad305d61e65f9abf06ebdff0..7c443d5479c4eaa9a8b1411bba9860874b3e766f 100644 --- a/scripts/Manifest.toml +++ b/scripts/Manifest.toml @@ -98,9 +98,9 @@ version = "0.2.2" [[deps.ChainRulesCore]] deps = ["Compat", "LinearAlgebra", "SparseArrays"] -git-tree-sha1 = "dc4405cee4b2fe9e1108caec2d760b7ea758eca2" +git-tree-sha1 = "e7ff6cadf743c098e08fca25c91103ee4303c9bb" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "1.15.5" +version = "1.15.6" [[deps.ChangesOfVariables]] deps = ["ChainRulesCore", "LinearAlgebra", "Test"] @@ -109,10 +109,10 @@ uuid = "9e997f8a-9a97-42d5-a9f1-ce6bfc15e2c0" version = "0.1.4" [[deps.Clustering]] -deps = ["Distances", "LinearAlgebra", "NearestNeighbors", "Printf", "SparseArrays", "Statistics", "StatsBase"] -git-tree-sha1 = "75479b7df4167267d75294d14b58244695beb2ac" +deps = ["Distances", "LinearAlgebra", "NearestNeighbors", "Printf", "Random", "SparseArrays", "Statistics", "StatsBase"] +git-tree-sha1 = "64df3da1d2a26f4de23871cd1b6482bb68092bd5" uuid = "aaaa29a8-35af-508c-8bc3-b662a17a0fe5" -version = "0.14.2" +version = "0.14.3" [[deps.CodeTracking]] deps = ["InteractiveUtils", "UUIDs"] @@ -157,10 +157,10 @@ uuid = "bbf7d656-a473-5ed7-a52c-81e309532950" version = "0.3.0" [[deps.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 = "78bee250c6826e1cf805a88b7f1e86025275d208" +deps = ["Dates", "LinearAlgebra", "UUIDs"] +git-tree-sha1 = "5856d3031cdb1f3b2b6340dfdc66b6d9a149a374" uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "3.46.0" +version = "4.2.0" [[deps.CompilerSupportLibraries_jll]] deps = ["Artifacts", "Libdl"] @@ -206,9 +206,9 @@ version = "1.11.0" [[deps.DataFrames]] deps = ["Compat", "DataAPI", "Future", "InvertedIndices", "IteratorInterfaceExtensions", "LinearAlgebra", "Markdown", "Missings", "PooledArrays", "PrettyTables", "Printf", "REPL", "Reexport", "SortingAlgorithms", "Statistics", "TableTraits", "Tables", "Unicode"] -git-tree-sha1 = "daa21eb85147f72e41f6352a57fccea377e310a9" +git-tree-sha1 = "db2a9cb664fcea7836da4b414c3278d71dd602d2" uuid = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" -version = "1.3.4" +version = "1.3.6" [[deps.DataStructures]] deps = ["Compat", "InteractiveUtils", "OrderedCollections"] @@ -242,10 +242,10 @@ deps = ["Mmap"] uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab" [[deps.DiffResults]] -deps = ["StaticArrays"] -git-tree-sha1 = "c18e98cba888c6c25d1c3b048e4b3380ca956805" +deps = ["StaticArraysCore"] +git-tree-sha1 = "782dd5f4561f5d267313f23853baaaa4c52ea621" uuid = "163ba53b-c6d8-5494-b064-1a9d43ac40c5" -version = "1.0.3" +version = "1.1.0" [[deps.DiffRules]] deps = ["IrrationalConstants", "LogExpFunctions", "NaNMath", "Random", "SpecialFunctions"] @@ -288,29 +288,16 @@ version = "0.6.8" [[deps.DualTVDD]] deps = ["Distributed", "LinearAlgebra", "Outsource", "StaticArrays", "StaticKernels"] -git-tree-sha1 = "793566b93fc631c146f6de28744e46a3ade4b64a" -repo-rev = "master" -repo-url = ".." +path = ".." uuid = "93adc0ee-851f-4b8b-8bf8-c8a87ded093b" version = "0.1.0" -[[deps.EarCut_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "e3290f2d49e661fbd94046d7e3726ffcb2d41053" -uuid = "5ae413db-bbd1-5e63-b57d-d24a61df00f5" -version = "2.2.4+0" - [[deps.Expat_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "bad72f730e9e91c08d9427d5e8db95478a3c323d" uuid = "2e619515-83b5-522b-bb60-26c02a35a201" version = "2.4.8+0" -[[deps.Extents]] -git-tree-sha1 = "5e1e4c53fa39afe63a7d356e30452249365fba99" -uuid = "411431e0-e8b7-467b-b5e0-f676ba4f2910" -version = "0.1.1" - [[deps.FFMPEG]] deps = ["FFMPEG_jll"] git-tree-sha1 = "b57e3acbe22f8484b4b5ff66a7499717fe1a9cc8" @@ -432,18 +419,6 @@ git-tree-sha1 = "d2827f7a249bd6dd1a67d35e2fab2e6b5da27e62" uuid = "14197337-ba66-59df-a3e3-ca00e7dcff7a" version = "0.3.3" -[[deps.GeoInterface]] -deps = ["Extents"] -git-tree-sha1 = "fb28b5dc239d0174d7297310ef7b84a11804dfab" -uuid = "cf35fbd7-0cd7-5166-be24-54bfbe79505f" -version = "1.0.1" - -[[deps.GeometryBasics]] -deps = ["EarCut_jll", "GeoInterface", "IterTools", "LinearAlgebra", "StaticArrays", "StructArrays", "Tables"] -git-tree-sha1 = "12a584db96f1d460421d5fb8860822971cdb8455" -uuid = "5c1252a2-5f33-56bf-86c9-59e7332b4326" -version = "0.4.4" - [[deps.Gettext_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "XML2_jll"] git-tree-sha1 = "9b02998aba7bf074d14de89f9d37ca24a1a0b046" @@ -1022,9 +997,9 @@ version = "0.2.0" [[deps.Optim]] deps = ["Compat", "FillArrays", "ForwardDiff", "LineSearches", "LinearAlgebra", "NLSolversBase", "NaNMath", "Parameters", "PositiveFactorizations", "Printf", "SparseArrays", "StatsBase"] -git-tree-sha1 = "ad8de074ed5dad13e87d76c467a82e5eff9c693a" +git-tree-sha1 = "b9fe76d1a39807fdcf790b991981a922de0c3050" uuid = "429524aa-4258-5aef-a3af-852621145aeb" -version = "1.7.2" +version = "1.7.3" [[deps.Opus_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -1105,10 +1080,10 @@ uuid = "995b91a9-d308-5afd-9ec6-746e21dbc043" version = "1.3.1" [[deps.Plots]] -deps = ["Base64", "Contour", "Dates", "Downloads", "FFMPEG", "FixedPointNumbers", "GR", "GeometryBasics", "JSON", "LaTeXStrings", "Latexify", "LinearAlgebra", "Measures", "NaNMath", "Pkg", "PlotThemes", "PlotUtils", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "Requires", "Scratch", "Showoff", "SparseArrays", "Statistics", "StatsBase", "UUIDs", "UnicodeFun", "Unzip"] -git-tree-sha1 = "3f9b0706d6051d8edf9959e2422666703080722a" +deps = ["Base64", "Contour", "Dates", "Downloads", "FFMPEG", "FixedPointNumbers", "GR", "JSON", "LaTeXStrings", "Latexify", "LinearAlgebra", "Measures", "NaNMath", "Pkg", "PlotThemes", "PlotUtils", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "RelocatableFolders", "Requires", "Scratch", "Showoff", "SparseArrays", "Statistics", "StatsBase", "UUIDs", "UnicodeFun", "Unzip"] +git-tree-sha1 = "6062b3b25ad3c58e817df0747fc51518b9110e5f" uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" -version = "1.32.0" +version = "1.33.0" [[deps.Polynomials]] deps = ["LinearAlgebra", "RecipesBase"] @@ -1335,9 +1310,9 @@ version = "0.1.1" [[deps.StaticArrays]] deps = ["LinearAlgebra", "Random", "StaticArraysCore", "Statistics"] -git-tree-sha1 = "2d4e51cfad63d2d34acde558027acbc66700349b" +git-tree-sha1 = "2189eb2c1f25cb3f43e5807f26aa864052e50c17" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "1.5.3" +version = "1.5.8" [[deps.StaticArraysCore]] git-tree-sha1 = "6b7ba252635a5eff6a0b0664a41ee140a1c9e72a" @@ -1365,12 +1340,6 @@ git-tree-sha1 = "d1bf48bfcc554a3761a133fe3a9bb01488e06916" uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" version = "0.33.21" -[[deps.StructArrays]] -deps = ["Adapt", "DataAPI", "StaticArraysCore", "Tables"] -git-tree-sha1 = "8c6ac65ec9ab781af05b08ff305ddc727c25f680" -uuid = "09ab397b-f2b6-538f-b94a-2f83cf4a842a" -version = "0.6.12" - [[deps.SuiteSparse]] deps = ["Libdl", "LinearAlgebra", "Serialization", "SparseArrays"] uuid = "4607b0f0-06f3-5cda-b6b1-a6196a1729e9" @@ -1400,9 +1369,9 @@ version = "1.0.2" [[deps.Tables]] deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "OrderedCollections", "TableTraits", "Test"] -git-tree-sha1 = "5ce79ce186cc678bbb5c5681ca3379d1ddae11a1" +git-tree-sha1 = "7149a60b01bf58787a1b83dad93f90d4b9afbe5d" uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" -version = "1.7.0" +version = "1.8.1" [[deps.Tar]] deps = ["ArgTools", "SHA"] diff --git a/scripts/run_experiments.jl b/scripts/run_experiments.jl index 462971c141b69742ec500d7ab500cac45f7faf04..11faf344ae690ef780e05216f6eabbbd18d8b63c 100644 --- a/scripts/run_experiments.jl +++ b/scripts/run_experiments.jl @@ -484,21 +484,22 @@ function experiment_global_basic(ctx) #f = loadimg(joinpath(ctx.indir, "frame10_small.png")) ax = axes(f) - seed = 42 + seed = 40 rng = MersenneTwister(seed) λ = 0.02 β = 1e-3 #maxiters = 10000 - maxiters = 100 + maxiters = 10000 ninner = 1000 M = (4,4) overlap = (5,5) n = length(f) - wr = rand(rng, 1:n, n÷2) + # masked wavelet coefficients + wr = LinearIndices(size(f))[rand(rng, Float64, size(f)) .> 0.5] #wr = n÷4:n÷2 A = LinearMap{Float64}(