diff --git a/scripts/Manifest.toml b/scripts/Manifest.toml index 37fd8620bffd3906d28ba2c3827a5d9b02c2f0ab..619e76a2934bb503f10ec5923c16012f39dc875b 100644 --- a/scripts/Manifest.toml +++ b/scripts/Manifest.toml @@ -1,6 +1,6 @@ # This file is machine-generated - editing it directly is not advised -julia_version = "1.7.1" +julia_version = "1.7.2" manifest_format = "2.0" [[deps.AbstractFFTs]] @@ -82,6 +82,12 @@ git-tree-sha1 = "bf98fa45a0a4cee295de98d4c1462be26345b9a1" uuid = "9e997f8a-9a97-42d5-a9f1-ce6bfc15e2c0" version = "0.1.2" +[[deps.CodeTracking]] +deps = ["InteractiveUtils", "UUIDs"] +git-tree-sha1 = "6d4fa04343a7fc9f9cb9cff9558929f3d2752717" +uuid = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2" +version = "1.0.9" + [[deps.CodecZlib]] deps = ["TranscodingStreams", "Zlib_jll"] git-tree-sha1 = "ded953804d019afa9a3f98981d99b33e3db7b6da" @@ -283,6 +289,9 @@ git-tree-sha1 = "04d13bfa8ef11720c24e4d840c0033d145537df7" uuid = "48062228-2e41-5def-b9a4-89aafe57970f" version = "0.9.17" +[[deps.FileWatching]] +uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee" + [[deps.FillArrays]] deps = ["LinearAlgebra", "Random", "SparseArrays", "Statistics"] git-tree-sha1 = "4c7d3757f3ecbcb9055870351078552b7d1dbd2d" @@ -309,9 +318,9 @@ version = "0.4.2" [[deps.ForwardDiff]] deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "LinearAlgebra", "LogExpFunctions", "NaNMath", "Preferences", "Printf", "Random", "SpecialFunctions", "StaticArrays"] -git-tree-sha1 = "1bd6fc0c344fc0cbee1f42f8d2e7ec8253dda2d2" +git-tree-sha1 = "34e6147e7686a101c245f12dba43b743c7afda96" uuid = "f6369f11-7733-5829-9624-2563aa707210" -version = "0.10.25" +version = "0.10.27" [[deps.FreeType2_jll]] deps = ["Artifacts", "Bzip2_jll", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"] @@ -553,12 +562,24 @@ git-tree-sha1 = "b53380851c6e6664204efb2e62cd24fa5c47e4ba" uuid = "aacddb02-875f-59d6-b918-886e6ef4fbf8" version = "2.1.2+0" +[[deps.JuliaInterpreter]] +deps = ["CodeTracking", "InteractiveUtils", "Random", "UUIDs"] +git-tree-sha1 = "52617c41d2761cc05ed81fe779804d3b7f14fff7" +uuid = "aa1ae85d-cabe-5617-a682-6adf51b2e16a" +version = "0.9.13" + [[deps.LAME_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "f6250b16881adf048549549fba48b1161acdac8c" uuid = "c1c5ebd0-6772-5130-a774-d5fcae4a789d" version = "3.100.1+0" +[[deps.LERC_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "bf36f528eec6634efc60d7ec062008f171071434" +uuid = "88015f11-f218-50d7-93a8-a6af411a945d" +version = "3.0.0+1" + [[deps.LZO_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "e5b909bcf985c5e2605737d2ce278ed791b89be6" @@ -636,10 +657,10 @@ uuid = "4b2f31a3-9ecc-558c-b454-b3730dcb73e9" version = "2.35.0+0" [[deps.Libtiff_jll]] -deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Pkg", "Zlib_jll", "Zstd_jll"] -git-tree-sha1 = "340e257aada13f95f98ee352d316c3bed37c8ab9" +deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "LERC_jll", "Libdl", "Pkg", "Zlib_jll", "Zstd_jll"] +git-tree-sha1 = "c9551dd26e31ab17b86cbd00c2ede019c08758eb" uuid = "89763e89-9b03-5906-acba-b20f662cd828" -version = "4.3.0+0" +version = "4.3.0+1" [[deps.Libuuid_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -666,6 +687,12 @@ version = "0.3.6" [[deps.Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" +[[deps.LoweredCodeUtils]] +deps = ["JuliaInterpreter"] +git-tree-sha1 = "dedbebe234e06e1ddad435f5c6f4b85cd8ce55f7" +uuid = "6f1432cf-f94c-5a45-995e-cdbf5db27b0b" +version = "2.2.2" + [[deps.MKL_jll]] deps = ["Artifacts", "IntelOpenMP_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "Pkg"] git-tree-sha1 = "5455aef09b40e5020e1520f551fa3135040d4ed0" @@ -780,7 +807,7 @@ version = "0.5.5+0" [[deps.OpticalFlowUtils]] deps = ["Colors", "FileIO", "LinearAlgebra"] -path = "/home/stev47/stuff/OpticalFlowUtils/" +git-tree-sha1 = "6f4b6018cbc630a1fed89e4e12467715ff255364" uuid = "ab0dad50-ab19-448c-b796-13553ec8b2d3" version = "0.2.0" @@ -901,9 +928,9 @@ version = "1.0.0" [[deps.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 = "ad368663a5e20dbb8d6dc2fddeefe4dae0781ae8" +git-tree-sha1 = "c6c0f690d0cc7caddb74cef7aa847b824a16b256" uuid = "ea2cea3b-5b76-57ae-a6ef-0a8af62496e1" -version = "5.15.3+0" +version = "5.15.3+1" [[deps.Quaternions]] deps = ["DualNumbers", "LinearAlgebra", "Random"] @@ -953,6 +980,12 @@ git-tree-sha1 = "838a3a4188e2ded87a4f9f184b4b0d78a1e91cb7" uuid = "ae029012-a4dd-5104-9daa-d747884805df" version = "1.3.0" +[[deps.Revise]] +deps = ["CodeTracking", "Distributed", "FileWatching", "JuliaInterpreter", "LibGit2", "LoweredCodeUtils", "OrderedCollections", "Pkg", "REPL", "Requires", "UUIDs", "Unicode"] +git-tree-sha1 = "4d4239e93531ac3e7ca7e339f15978d0b5149d03" +uuid = "295af30f-e4ad-537b-8983-00126c2a3abe" +version = "3.3.3" + [[deps.Rotations]] deps = ["LinearAlgebra", "Quaternions", "Random", "StaticArrays", "Statistics"] git-tree-sha1 = "a167638e2cbd8ac41f9cd57282cab9b042fa26e6" @@ -1026,9 +1059,9 @@ version = "0.1.1" [[deps.StaticArrays]] deps = ["LinearAlgebra", "Random", "Statistics"] -git-tree-sha1 = "6354dfaf95d398a1a70e0b28238321d5d17b2530" +git-tree-sha1 = "cd56bf18ed715e8b09f06ef8c6b781e6cdc49911" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "1.4.0" +version = "1.4.4" [[deps.Statistics]] deps = ["LinearAlgebra", "SparseArrays"] diff --git a/scripts/Project.toml b/scripts/Project.toml index ef4af9d6ab57f0366d2cebd285a5cfac65054962..b47c307c7f24376ccc3831525d0b154027669434 100644 --- a/scripts/Project.toml +++ b/scripts/Project.toml @@ -4,11 +4,14 @@ ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" Colors = "5ae59095-9a9b-59fe-a467-6f913c188581" DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" +ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" ImageIO = "82e4d734-157c-48bb-816b-45c225c6df19" ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1" ImageQualityIndexes = "2996bd0c-7a13-11e9-2da2-2f5ce47296a9" OpticalFlowUtils = "ab0dad50-ab19-448c-b796-13553ec8b2d3" PGFPlotsX = "8314cec4-20b6-5062-9cdb-752b83310925" Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" +Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" SemiSmoothNewton = "a35a6534-5ddf-4107-9885-a23102237ad0" +StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" WriteVTK = "64499a7a-5c06-52f2-abe2-ccb03c286192" diff --git a/scripts/run_experiments.jl b/scripts/run_experiments.jl index 53937cdb7ab1ded938b5ea879bb25b31fe6b58a6..c9196e1bb73967223e54ff978ce7a5932b7eb5ed 100644 --- a/scripts/run_experiments.jl +++ b/scripts/run_experiments.jl @@ -888,20 +888,26 @@ function denoise(ctx) return st end +function add_noise(img; noise_sigma, noise_p) + rng = (seed = 42; MersenneTwister(seed)) + #img_noisy = clamp.(img .+ noise_sigma * randn(rng, Float64, size(img)), 0., 1.) + img_noisy = img .+ noise_sigma * randn(rng, Float64, size(img)) + for i in eachindex(img) + if rand(rng) < noise_p + img_noisy[i] = rand(Bool) ? 1. : 0. + end + end + + return img_noisy +end + function experiment_denoise(ctx) g_arr = loadimg(joinpath(ctx.indir, "input.png")) noise_sigma = 0.1 noise_p = 0.02 - rng = (seed = 42; MersenneTwister(seed)) - #g_arr = clamp.(g_arr .+ noise_sigma * randn(rng, Float64, size(g_arr)), 0., 1.) - g_arr .+= noise_sigma * randn(rng, Float64, size(g_arr)) - for i in eachindex(g_arr) - if rand(rng) < noise_p - g_arr[i] = rand(Bool) ? 1. : 0. - end - end + g_arr = add_noise(g_arr; noise_sigma, noise_p) saveimg(joinpath(ctx.outdir, "input_noisy.png"), grayclamp.(g_arr))