diff --git a/.gitignore b/.gitignore index d6c9ed3..55905b3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ luxor-drawing* test/std* *.gif *.png +Manifest.toml diff --git a/Project.toml b/Project.toml index 29206e2..80c7257 100644 --- a/Project.toml +++ b/Project.toml @@ -1,15 +1,13 @@ name = "MechanicalSketch" uuid = "183f2c95-4b91-4df3-9bd2-197e8f9edb13" authors = ["hustf and contributors"] -version = "0.5.3" +version = "0.6.0" [deps] ColorSchemes = "35d6a980-a343-548e-a6ea-1d62b119f2f4" Colors = "5ae59095-9a9b-59fe-a467-6f913c188581" FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" -ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1" -Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59" LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f" Latexify = "23fbe1c1-3f47-55db-b15f-69d7ec21a316" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" diff --git a/src/MechanicalSketch.jl b/src/MechanicalSketch.jl index 552ffb7..d027b47 100644 --- a/src/MechanicalSketch.jl +++ b/src/MechanicalSketch.jl @@ -1,5 +1,4 @@ module MechanicalSketch -# TODO import new Luxor functions from latest revision. import Luxor import Luxor: # Layout @@ -138,12 +137,11 @@ weighted_color_mean, Colors, parse, comp1, comp2, comp3, comp4 using MechanicalUnits -#import MechanicalUnits: Power, oneunit, numtype, AbstractQuantity # TODO import these to MechanicalUnits! import MechanicalUnits.Unitfu: Power, oneunit, numtype, AbstractQuantity @import_expand kW # Don't use ~ since that would also import WI, which we use elsewhere. import Latexify, LaTeXStrings, NodeJS -import Latexify: @latexify, latexify, @latexrecipe -import LaTeXStrings: LaTeXString, @L_str +using Latexify: @latexify, latexify, @latexrecipe +using LaTeXStrings: LaTeXString, @L_str """ Rotations given with units occur around the positive z axis, when y is up and x is to the right. We don't dispatch on the dimension of angles, because the dimension is NonDims (for good reason). @@ -152,17 +150,17 @@ In the context of this package, defining Angle is considered harmless: const Angle = Union{typeof(1.0°), typeof(1°), typeof(1.0f0°), typeof(1.0rad), typeof(1rad), typeof(1.0f0*rad)} # TODO move Angle to numeric types... import ColorSchemes -import ColorSchemes: getinverse, get -import ColorSchemes: RGB, RGBA -import ColorSchemes: HSV, HSVA, HSL, HSLA, LCHab, LCHabA, LCHuv, LCHuvA # Cylindrical hue colorspaces -import ColorSchemes: isoluminant_cgo_70_c39_n256, leonardo, PuOr_8, Greys_9 # We also define ColSchemeNoMiddle in 'colors.jl' +using ColorSchemes: getinverse, get +using ColorSchemes: RGB, RGBA +using ColorSchemes: HSV, HSVA, HSL, HSLA, LCHab, LCHabA, LCHuv, LCHuvA # Cylindrical hue colorspaces +using ColorSchemes: isoluminant_cgo_70_c39_n256, leonardo, PuOr_8, Greys_9 # We also define ColSchemeNoMiddle in 'colors.jl' import Base: -, +, *, /, hypot, product, show -import Colors: @colorant_str -import FileIO: @format_str, File, save -import ForwardDiff +using Colors: @colorant_str +using FileIO: @format_str, File, save +#import ForwardDiff import StaticArrays -import StaticArrays: SA, SVector -import Interpolations: interpolate, Linear, Flat, extrapolate, Extrapolation, Gridded +using StaticArrays: SA, SVector +#import Interpolations: interpolate, Linear, Flat, extrapolate, Extrapolation, Gridded const CHORD_ZERO = 0.25 const FOIL_CHORD_POS = [0, 0.0125, 0.025, 0.05, 0.075, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 0.95, 1] const FOIL_HALF_T = [0, 0.117, 0.1575, 0.2179, 0.2649, 0.3042, 0.4146, 0.4764, 0.5, 0.4816, 0.4149, 0.3159, 0.1989, 0.0811, 0.0306, 0] diff --git a/src/autodiff_unitfu.jl b/src/autodiff_unitfu.jl index fd39e71..6cb9a1f 100644 --- a/src/autodiff_unitfu.jl +++ b/src/autodiff_unitfu.jl @@ -1,4 +1,4 @@ -""" +#=""" generate_Q²_to_Q_from_CQ_to_Q(CQ_to_Q) Input: f: CQ → Q @@ -174,4 +174,5 @@ care if differentiating twice! """ function ∇(f; physwidth = 10.0m, physheight = 4.0m) matrix_to_function(∇_rectangle(f; physwidth, physheight)) -end \ No newline at end of file +end +=# \ No newline at end of file diff --git a/src/matrix_interpolation.jl b/src/matrix_interpolation.jl index 957eb2d..f4ef8a3 100644 --- a/src/matrix_interpolation.jl +++ b/src/matrix_interpolation.jl @@ -1,3 +1,4 @@ +#= Interpolations.jl and ForwardDiff.jl are removed as dependencies in this version. """ function_to_interpolated_function(f_xy; physwidth = 10.0m, physheight = 4.0m) @@ -95,3 +96,4 @@ function matrix_to_function(matrix) # temp ::Array{Float64,2}) extrapolate(fxy_inter, Flat()) end +=# \ No newline at end of file diff --git a/src/streamline_convolution.jl b/src/streamline_convolution.jl index 81e3cc2..061224a 100644 --- a/src/streamline_convolution.jl +++ b/src/streamline_convolution.jl @@ -1,3 +1,4 @@ +#= ForwardDiff and Interpolations removed as dependencies from this version. """ draw_streamlines(pt, f_xy; physwidth = 10.0m, physheight = 4.0m, centered = true, h = 0.1s, nsteps = 10, probability = 0.0001) @@ -58,7 +59,7 @@ Return x for x in the interval [-maxabs, maxabs] Repeating between these values. """ -sawtooth(x, maxabs) = rem(x, 2maxabs, RoundNearest) +sawtooth(x, maxabs) = rem(x, 2maxabs, RoundNearest) """ line_integral_convolution_complex(f_xy, n_xy, x_mid, y_mid, f_s, f_0) @@ -107,7 +108,7 @@ function line_integral_convolution_complex(f_xy, n_xy, x_mid, y_mid, f_s, f_0) ŝ end - +=# """ noise_between_wavelengths(λ_min, λ_max, x) @@ -181,7 +182,7 @@ function noise_between_wavelengths(λ_min, λ_max, xs::T, ys::T; normalize = tru no = [ noise_between_wavelengths(λ_min, λ_max, x, y) for y in ys, x in xs] normalize ? normalize_datarange(no) : no end - +#= """ noise_for_lic(f_xy, xs, ys) @@ -385,7 +386,7 @@ end Linear floating index of q given that index 1 corresponds to 'mini' and 'maxindex' corresponds to 'maxi'. """ -float_index(maxindex::Int, mini::T, maxi::T, q::T) where T = 1 + (maxindex - 1) * (q - mini) / (maxi - mini) +float_index(maxindex::Int, mini::T, maxi::T, q::T) where T = 1 + (maxindex - 1) * (q - mini) / (maxi - mini) """ @@ -790,4 +791,5 @@ function color_matrix_mix(lumin_mat, quant_scalar_mat, legend, luminosity_variat # lum will be in the range 0 to 100. color_with_lumin(col, lum) end -end \ No newline at end of file +end +=# \ No newline at end of file diff --git a/test/Manifest.toml b/test/Manifest.toml index 202a606..260d57a 100644 --- a/test/Manifest.toml +++ b/test/Manifest.toml @@ -1,795 +1,809 @@ # This file is machine-generated - editing it directly is not advised -[[AbstractFFTs]] -deps = ["LinearAlgebra"] -git-tree-sha1 = "485ee0867925449198280d4af84bdb46a2a404d0" -uuid = "621f4979-c628-5d54-868e-fcf4e3e8185c" -version = "1.0.1" +julia_version = "1.7.0-beta2" +manifest_format = "2.0" -[[Adapt]] +[[deps.Adapt]] deps = ["LinearAlgebra"] git-tree-sha1 = "84918055d15b3114ede17ac6a7182f68870c16f7" uuid = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" version = "3.3.1" -[[ArgTools]] +[[deps.ArgTools]] uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f" -[[ArnoldiMethod]] -deps = ["LinearAlgebra", "Random", "StaticArrays"] -git-tree-sha1 = "f87e559f87a45bece9c9ed97458d3afe98b1ebb9" -uuid = "ec485272-7323-5ecc-a04f-4719b315124d" -version = "0.1.0" - -[[Artifacts]] +[[deps.Artifacts]] uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" -[[Base64]] +[[deps.Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" -[[Bzip2_jll]] +[[deps.Bzip2_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "19a35467a82e236ff51bc17a3a44b69ef35185a2" +git-tree-sha1 = "c3598e525718abcc440f69cc6d5f60dda0a1b61e" uuid = "6e34b625-4abd-537c-b88f-471c36dfa7a0" -version = "1.0.8+0" +version = "1.0.6+5" -[[Cairo_jll]] +[[deps.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"] -git-tree-sha1 = "f2202b55d816427cd385a9a4f3ffb226bee80f99" +git-tree-sha1 = "e2f47f6d8337369411569fd45ae5753ca10394c6" uuid = "83423d85-b0ee-5818-9007-b63ccbeb887a" -version = "1.16.1+0" - -[[ChainRulesCore]] -deps = ["Compat", "LinearAlgebra", "SparseArrays"] -git-tree-sha1 = "ea05cadc30c15f9185b61ea418b9d47d53b55bc2" -uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "0.10.8" +version = "1.16.0+6" -[[ColorSchemes]] +[[deps.ColorSchemes]] deps = ["ColorTypes", "Colors", "FixedPointNumbers", "Random", "StaticArrays"] git-tree-sha1 = "c8fd01e4b736013bc61b704871d20503b33ea402" uuid = "35d6a980-a343-548e-a6ea-1d62b119f2f4" version = "3.12.1" -[[ColorTypes]] +[[deps.ColorTypes]] deps = ["FixedPointNumbers", "Random"] -git-tree-sha1 = "32a2b8af383f11cbb65803883837a149d10dfe8a" +git-tree-sha1 = "024fe24d83e4a5bf5fc80501a314ce0d1aa35597" uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" -version = "0.10.12" +version = "0.11.0" -[[Colors]] +[[deps.Colors]] deps = ["ColorTypes", "FixedPointNumbers", "Reexport"] git-tree-sha1 = "417b0ed7b8b838aa6ca0a87aadf1bb9eb111ce40" uuid = "5ae59095-9a9b-59fe-a467-6f913c188581" version = "0.12.8" -[[Compat]] +[[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 = "dc7dedc2c2aa9faf59a55c622760a25cbefbe941" uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" version = "3.31.0" -[[CompilerSupportLibraries_jll]] +[[deps.CompilerSupportLibraries_jll]] deps = ["Artifacts", "Libdl"] uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" -[[Contour]] +[[deps.Contour]] deps = ["StaticArrays"] git-tree-sha1 = "9f02045d934dc030edad45944ea80dbd1f0ebea7" uuid = "d38c429a-6771-53c6-b99e-75d170b6e991" version = "0.5.7" -[[DSP]] -deps = ["Compat", "FFTW", "IterTools", "LinearAlgebra", "Polynomials", "Random", "Reexport", "SpecialFunctions", "Statistics"] -git-tree-sha1 = "c6dc51c5597bffe9100ccea0e850dc99afeeaeeb" -uuid = "717857b8-e6f2-59f4-9121-6e50c889abd2" -version = "0.7.2" - -[[DataAPI]] -git-tree-sha1 = "dfb3b7e89e395be1e25c2ad6d7690dc29cc53b1d" +[[deps.DataAPI]] +git-tree-sha1 = "ee400abb2298bd13bfc3df1c412ed228061a2385" uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a" -version = "1.6.0" +version = "1.7.0" -[[DataStructures]] +[[deps.DataStructures]] deps = ["Compat", "InteractiveUtils", "OrderedCollections"] git-tree-sha1 = "4437b64df1e0adccc3e5d1adbc3ac741095e4677" uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" version = "0.18.9" -[[DataValueInterfaces]] +[[deps.DataValueInterfaces]] git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6" uuid = "e2d170a0-9d28-54be-80f0-106bbe20a464" version = "1.0.0" -[[Dates]] +[[deps.Dates]] deps = ["Printf"] uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" -[[DelimitedFiles]] +[[deps.DelimitedFiles]] deps = ["Mmap"] uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab" -[[Distributed]] +[[deps.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" - -[[Downloads]] +[[deps.Downloads]] deps = ["ArgTools", "LibCURL", "NetworkOptions"] uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6" -[[EarCut_jll]] +[[deps.EarCut_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "92d8f9f208637e8d2d28c664051a00569c01493d" uuid = "5ae413db-bbd1-5e63-b57d-d24a61df00f5" version = "2.1.5+1" -[[Expat_jll]] +[[deps.Expat_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "b3bfd02e98aedfa5cf885665493c5598c350cd2f" uuid = "2e619515-83b5-522b-bb60-26c02a35a201" version = "2.2.10+0" -[[ExprTools]] -git-tree-sha1 = "10407a39b87f29d47ebaca8edbc75d7c302ff93e" -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" - -[[FFMPEG]] +[[deps.FFMPEG]] deps = ["FFMPEG_jll"] -path = "C:\\Users\\frohu_h4g8g6y\\.julia\\dev\\FFMPEG" +git-tree-sha1 = "b57e3acbe22f8484b4b5ff66a7499717fe1a9cc8" uuid = "c87230d0-a227-11e9-1b43-d7ebe4e7570a" -version = "0.4.2" +version = "0.4.1" -[[FFMPEG_jll]] -deps = ["Artifacts", "Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "JLLWrappers", "LAME_jll", "Libdl", "Ogg_jll", "OpenSSL_jll", "Opus_jll", "Pkg", "Zlib_jll", "libass_jll", "libfdk_aac_jll", "libvorbis_jll", "x264_jll", "x265_jll"] -git-tree-sha1 = "d8a578692e3077ac998b50c0217dfd67f21d1e5f" +[[deps.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"] +git-tree-sha1 = "3cc57ad0a213808473eafef4845a74766242e05f" uuid = "b22a6f82-2f65-5046-a5b2-351ab43fb4e5" -version = "4.4.0+0" - -[[FFTW]] -deps = ["AbstractFFTs", "FFTW_jll", "LinearAlgebra", "MKL_jll", "Preferences", "Reexport"] -git-tree-sha1 = "ae8de3350af3026008be4ba23e1e905ab2011d20" -uuid = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341" -version = "1.4.2" - -[[FFTW_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "5a0d4b6a22a34d17d53543bd124f4b08ed78e8b0" -uuid = "f5851436-0d7a-5f13-b9de-f02708fd171a" -version = "3.3.9+7" +version = "4.3.1+4" -[[FixedPointNumbers]] +[[deps.FixedPointNumbers]] deps = ["Statistics"] git-tree-sha1 = "335bfdceacc84c5cdf16aadc768aa5ddfc5383cc" uuid = "53c48c17-4a7d-5ca2-90c5-79b7896eea93" version = "0.8.4" -[[Fontconfig_jll]] +[[deps.Fontconfig_jll]] deps = ["Artifacts", "Bzip2_jll", "Expat_jll", "FreeType2_jll", "JLLWrappers", "Libdl", "Libuuid_jll", "Pkg", "Zlib_jll"] -git-tree-sha1 = "21efd19106a55620a188615da6d3d06cd7f6ee03" +git-tree-sha1 = "35895cf184ceaab11fd778b4590144034a167a2f" uuid = "a3f928ae-7b40-5064-980b-68af3947d34b" -version = "2.13.93+0" +version = "2.13.1+14" -[[Formatting]] +[[deps.Formatting]] deps = ["Printf"] git-tree-sha1 = "8339d61043228fdd3eb658d86c926cb282ae72a8" uuid = "59287772-0a20-5a39-b81b-1366585eb4c0" version = "0.4.2" -[[FreeType2_jll]] +[[deps.FreeType2_jll]] deps = ["Artifacts", "Bzip2_jll", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"] -git-tree-sha1 = "87eb71354d8ec1a96d4a7636bd57a7347dde3ef9" +git-tree-sha1 = "cbd58c9deb1d304f5a245a0b7eb841a2560cfec6" uuid = "d7e528f0-a631-5988-bf34-fe36492bcfd7" -version = "2.10.4+0" +version = "2.10.1+5" -[[FriBidi_jll]] +[[deps.FriBidi_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "aa31987c2ba8704e23c6c8ba8a4f769d5d7e4f91" uuid = "559328eb-81f9-559d-9380-de523a88c83c" version = "1.0.10+0" -[[GR]] -deps = ["Base64", "DelimitedFiles", "HTTP", "JSON", "LinearAlgebra", "Printf", "Random", "Serialization", "Sockets", "Test", "UUIDs"] -git-tree-sha1 = "cd0f34bd097d4d5eb6bbe01778cf8a7ed35f29d9" +[[deps.GLFW_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Libglvnd_jll", "Pkg", "Xorg_libXcursor_jll", "Xorg_libXi_jll", "Xorg_libXinerama_jll", "Xorg_libXrandr_jll"] +git-tree-sha1 = "dba1e8614e98949abfa60480b13653813d8f0157" +uuid = "0656b61e-2033-5cc2-a64a-77c0f6c09b89" +version = "3.3.5+0" + +[[deps.GR]] +deps = ["Base64", "DelimitedFiles", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Pkg", "Printf", "Random", "Serialization", "Sockets", "Test", "UUIDs"] +git-tree-sha1 = "b83e3125048a9c3158cbb7ca423790c7b1b57bea" uuid = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71" -version = "0.52.0" +version = "0.57.5" + +[[deps.GR_jll]] +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 = "e14907859a1d3aee73a019e7b3c98e9e7b8b5b3e" +uuid = "d2c73de3-f751-5644-a686-071e5b155ba9" +version = "0.57.3+0" -[[GeometryBasics]] +[[deps.GeometryBasics]] deps = ["EarCut_jll", "IterTools", "LinearAlgebra", "StaticArrays", "StructArrays", "Tables"] git-tree-sha1 = "4136b8a5668341e58398bb472754bff4ba0456ff" uuid = "5c1252a2-5f33-56bf-86c9-59e7332b4326" version = "0.3.12" -[[Gettext_jll]] +[[deps.Gettext_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "XML2_jll"] git-tree-sha1 = "9b02998aba7bf074d14de89f9d37ca24a1a0b046" uuid = "78b55507-aeef-58d4-861c-77aaff3498b1" version = "0.21.0+0" -[[Glib_jll]] +[[deps.Glib_jll]] deps = ["Artifacts", "Gettext_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Libiconv_jll", "Libmount_jll", "PCRE_jll", "Pkg", "Zlib_jll"] git-tree-sha1 = "47ce50b742921377301e15005c96e979574e130b" uuid = "7746bdde-850d-59dc-9ae8-88ece973131d" version = "2.68.1+0" -[[Graphite2_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "344bf40dcab1073aca04aa0df4fb092f920e4011" -uuid = "3b182d85-2403-5c21-9c21-1e1f0cc25472" -version = "1.3.14+0" - -[[Grisu]] +[[deps.Grisu]] git-tree-sha1 = "53bb909d1151e57e2484c3d1b53e19552b887fb2" uuid = "42e2da0e-8278-4e71-bc24-59509adca0fe" version = "1.0.2" -[[HTTP]] -deps = ["Base64", "Dates", "IniFile", "MbedTLS", "Sockets"] -git-tree-sha1 = "c7ec02c4c6a039a98a15f955462cd7aea5df4508" +[[deps.HTTP]] +deps = ["Base64", "Dates", "IniFile", "MbedTLS", "NetworkOptions", "Sockets", "URIs"] +git-tree-sha1 = "86ed84701fbfd1142c9786f8e53c595ff5a4def9" uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" -version = "0.8.19" +version = "0.9.10" -[[HarfBuzz_jll]] -deps = ["Artifacts", "Cairo_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "Graphite2_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Pkg"] -git-tree-sha1 = "8a954fed8ac097d5be04921d595f741115c1b2ad" -uuid = "2e76f6c2-a576-52d4-95c1-20adfe4de566" -version = "2.8.1+0" - -[[Inflate]] -git-tree-sha1 = "f5fc07d4e706b84f72d54eedcc1c13d92fb0871c" -uuid = "d25df0c9-e2be-5dd7-82c8-3ad0b3e990b9" -version = "0.1.2" - -[[IniFile]] +[[deps.IniFile]] deps = ["Test"] git-tree-sha1 = "098e4d2c533924c921f9f9847274f2ad89e018b8" uuid = "83e8ac13-25f8-5344-8a64-a9f2b223428f" version = "0.5.0" -[[IntelOpenMP_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "d979e54b71da82f3a65b62553da4fc3d18c9004c" -uuid = "1d5cc7b8-4909-519e-a0f8-d0f5ad9712d0" -version = "2018.0.3+2" - -[[InteractiveUtils]] +[[deps.InteractiveUtils]] deps = ["Markdown"] uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" -[[Intervals]] -deps = ["Dates", "Printf", "RecipesBase", "Serialization", "TimeZones"] -git-tree-sha1 = "323a38ed1952d30586d0fe03412cde9399d3618b" -uuid = "d8418881-c3e1-53bb-8760-2df7ec849ed5" -version = "1.5.0" - -[[IterTools]] +[[deps.IterTools]] git-tree-sha1 = "05110a2ab1fc5f932622ffea2a003221f4782c18" uuid = "c8e1da08-722c-5040-9ed9-7db0dc04731e" version = "1.3.0" -[[IteratorInterfaceExtensions]] +[[deps.IteratorInterfaceExtensions]] git-tree-sha1 = "a3f24677c21f5bbe9d2a714f95dcd58337fb2856" uuid = "82899510-4779-5014-852e-03e436cf321d" version = "1.0.0" -[[JLLWrappers]] +[[deps.JLLWrappers]] deps = ["Preferences"] git-tree-sha1 = "642a199af8b68253517b80bd3bfd17eb4e84df6e" uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" version = "1.3.0" -[[JSON]] +[[deps.JSON]] deps = ["Dates", "Mmap", "Parsers", "Unicode"] git-tree-sha1 = "81690084b6198a2e1da36fcfda16eeca9f9f24e4" uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" version = "0.21.1" -[[LAME_jll]] +[[deps.JpegTurbo_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "d735490ac75c5cb9f1b00d8b5509c11984dc6943" +uuid = "aacddb02-875f-59d6-b918-886e6ef4fbf8" +version = "2.1.0+0" + +[[deps.LAME_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "f6250b16881adf048549549fba48b1161acdac8c" uuid = "c1c5ebd0-6772-5130-a774-d5fcae4a789d" version = "3.100.1+0" -[[LZO_jll]] +[[deps.LZO_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "e5b909bcf985c5e2605737d2ce278ed791b89be6" uuid = "dd4b983a-f0e5-5f8d-a1b7-129d4a5fb1ac" version = "2.10.1+0" -[[LaTeXStrings]] +[[deps.LaTeXStrings]] git-tree-sha1 = "c7f1c695e06c01b95a67f0cd1d34994f3e7db104" uuid = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f" version = "1.2.1" -[[Latexify]] +[[deps.Latexify]] deps = ["Formatting", "InteractiveUtils", "LaTeXStrings", "MacroTools", "Markdown", "Printf", "Requires"] git-tree-sha1 = "a4b12a1bd2ebade87891ab7e36fdbce582301a92" uuid = "23fbe1c1-3f47-55db-b15f-69d7ec21a316" version = "0.15.6" -[[LazyArtifacts]] -deps = ["Artifacts", "Pkg"] -uuid = "4af54fe1-eca0-43a8-85a7-787d91b784e3" - -[[LibCURL]] +[[deps.LibCURL]] deps = ["LibCURL_jll", "MozillaCACerts_jll"] uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21" -[[LibCURL_jll]] +[[deps.LibCURL_jll]] deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"] uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0" -[[LibGit2]] +[[deps.LibGit2]] deps = ["Base64", "NetworkOptions", "Printf", "SHA"] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" -[[LibSSH2_jll]] +[[deps.LibSSH2_jll]] deps = ["Artifacts", "Libdl", "MbedTLS_jll"] uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8" -[[Libdl]] +[[deps.LibVPX_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "12ee7e23fa4d18361e7c2cde8f8337d4c3101bc7" +uuid = "dd192d2f-8180-539f-9fb4-cc70b1dcf69a" +version = "1.10.0+0" + +[[deps.Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" -[[Libffi_jll]] +[[deps.Libffi_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "761a393aeccd6aa92ec3515e428c26bf99575b3b" uuid = "e9f186c6-92d2-5b65-8a66-fee21dc1b490" version = "3.2.2+0" -[[Libgcrypt_jll]] +[[deps.Libgcrypt_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgpg_error_jll", "Pkg"] git-tree-sha1 = "64613c82a59c120435c067c2b809fc61cf5166ae" uuid = "d4300ac3-e22c-5743-9152-c294e39db1e4" version = "1.8.7+0" -[[Libgpg_error_jll]] +[[deps.Libglvnd_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll", "Xorg_libXext_jll"] +git-tree-sha1 = "7739f837d6447403596a75d19ed01fd08d6f56bf" +uuid = "7e76a0d4-f3c7-5321-8279-8d96eeed0f29" +version = "1.3.0+3" + +[[deps.Libgpg_error_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "c333716e46366857753e273ce6a69ee0945a6db9" uuid = "7add5ba3-2f88-524e-9cd5-f83b8a55f7b8" version = "1.42.0+0" -[[Libiconv_jll]] +[[deps.Libiconv_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "42b62845d70a619f063a7da093d995ec8e15e778" uuid = "94ce4f54-9a6c-5748-9c1c-f9c7231a4531" version = "1.16.1+1" -[[Libmount_jll]] +[[deps.Libmount_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "9c30530bf0effd46e15e0fdcf2b8636e78cbbd73" uuid = "4b2f31a3-9ecc-558c-b454-b3730dcb73e9" version = "2.35.0+0" -[[Libuuid_jll]] +[[deps.Libtiff_jll]] +deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Pkg", "Zlib_jll", "Zstd_jll"] +git-tree-sha1 = "340e257aada13f95f98ee352d316c3bed37c8ab9" +uuid = "89763e89-9b03-5906-acba-b20f662cd828" +version = "4.3.0+0" + +[[deps.Libuuid_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "7f3efec06033682db852f8b3bc3c1d2b0a0ab066" uuid = "38a345b3-de98-5d2b-a5d3-14cd9215e700" version = "2.36.0+0" -[[LightGraphs]] -deps = ["ArnoldiMethod", "DataStructures", "Distributed", "Inflate", "LinearAlgebra", "Random", "SharedArrays", "SimpleTraits", "SparseArrays", "Statistics"] -git-tree-sha1 = "432428df5f360964040ed60418dd5601ecd240b6" -uuid = "093fc24a-ae57-5d10-9952-331d41423f4d" -version = "1.3.5" - -[[LinearAlgebra]] -deps = ["Libdl"] +[[deps.LinearAlgebra]] +deps = ["Libdl", "libblastrampoline_jll"] uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" -[[LogExpFunctions]] -deps = ["DocStringExtensions", "LinearAlgebra"] -git-tree-sha1 = "1ba664552f1ef15325e68dc4c05c3ef8c2d5d885" -uuid = "2ab3a3ac-af41-5b50-aa03-7779005ae688" -version = "0.2.4" - -[[Logging]] +[[deps.Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" -[[MKL_jll]] -deps = ["Artifacts", "IntelOpenMP_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "Pkg"] -git-tree-sha1 = "c253236b0ed414624b083e6b72bfe891fbd2c7af" -uuid = "856f044c-d86e-5d09-b602-aeab76dc8ba7" -version = "2021.1.1+1" - -[[MacroTools]] +[[deps.MacroTools]] deps = ["Markdown", "Random"] git-tree-sha1 = "6a8a2a625ab0dea913aba95c11370589e0239ff0" uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" version = "0.5.6" -[[Markdown]] +[[deps.Markdown]] deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" -[[MbedTLS]] +[[deps.MbedTLS]] deps = ["Dates", "MbedTLS_jll", "Random", "Sockets"] git-tree-sha1 = "1c38e51c3d08ef2278062ebceade0e46cefc96fe" uuid = "739be429-bea8-5141-9913-cc70e7f3736d" version = "1.0.3" -[[MbedTLS_jll]] +[[deps.MbedTLS_jll]] deps = ["Artifacts", "Libdl"] uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" -[[Measures]] +[[deps.Measures]] git-tree-sha1 = "e498ddeee6f9fdb4551ce855a46f54dbd900245f" uuid = "442fdcdd-2543-5da2-b0f3-8c86c306513e" version = "0.3.1" -[[Missings]] +[[deps.Missings]] deps = ["DataAPI"] git-tree-sha1 = "4ea90bd5d3985ae1f9a908bd4500ae88921c5ce7" uuid = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28" version = "1.0.0" -[[Mmap]] +[[deps.Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" -[[Mocking]] -deps = ["ExprTools"] -git-tree-sha1 = "916b850daad0d46b8c71f65f719c49957e9513ed" -uuid = "78c3b35d-d492-501b-9361-3d52fe80e533" -version = "0.7.1" - -[[MozillaCACerts_jll]] +[[deps.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" - -[[NaNMath]] +[[deps.NaNMath]] git-tree-sha1 = "bfe47e760d60b82b66b61d2d44128b62e3a369fb" uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" version = "0.3.5" -[[NetworkOptions]] +[[deps.NetworkOptions]] uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" -[[Ogg_jll]] +[[deps.Ogg_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "7937eda4681660b4d6aeeecc2f7e1c81c8ee4e2f" uuid = "e7412a2a-1a6e-54c0-be00-318e2571c051" version = "1.3.5+0" -[[OpenSSL_jll]] +[[deps.OpenBLAS_jll]] +deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"] +uuid = "4536629a-c528-5b80-bd46-f80d51c5b363" + +[[deps.OpenSSL_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "15003dcb7d8db3c6c857fda14891a539a8f2705a" uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" version = "1.1.10+0" -[[OpenSpecFun_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "13652491f6856acfd2db29360e1bbcd4565d04f1" -uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e" -version = "0.5.5+0" - -[[Opus_jll]] +[[deps.Opus_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "51a08fb14ec28da2ec7a927c4337e4332c2a4720" uuid = "91d4177d-7536-5919-b921-800302f37372" version = "1.3.2+0" -[[OrderedCollections]] +[[deps.OrderedCollections]] git-tree-sha1 = "85f8e6578bf1f9ee0d11e7bb1b1456435479d47c" uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" version = "1.4.1" -[[PCRE_jll]] +[[deps.PCRE_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "b2a7af664e098055a7529ad1a900ded962bca488" uuid = "2f80f16e-611a-54ab-bc61-aa92de5b98fc" version = "8.44.0+0" -[[Parsers]] +[[deps.Parsers]] deps = ["Dates"] git-tree-sha1 = "c8abc88faa3f7a3950832ac5d6e690881590d6dc" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" version = "1.1.0" -[[Pixman_jll]] +[[deps.Pixman_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "b4f5d02549a10e20780a24fce72bea96b6329e29" uuid = "30392449-352a-5448-841d-b1acce4e97dc" version = "0.40.1+0" -[[Pkg]] +[[deps.Pkg]] deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"] uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" -[[PlotThemes]] +[[deps.PlotThemes]] deps = ["PlotUtils", "Requires", "Statistics"] git-tree-sha1 = "a3a964ce9dc7898193536002a6dd892b1b5a6f1d" uuid = "ccf2f8ad-2431-5c83-bf29-c5338b663b6a" version = "2.0.1" -[[PlotUtils]] +[[deps.PlotUtils]] deps = ["ColorSchemes", "Colors", "Dates", "Printf", "Random", "Reexport", "Statistics"] git-tree-sha1 = "ae9a295ac761f64d8c2ec7f9f24d21eb4ffba34d" uuid = "995b91a9-d308-5afd-9ec6-746e21dbc043" version = "1.0.10" -[[Plots]] +[[deps.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 = "f3a57a5acc16a69c03539b3684354cbbbb72c9ad" +git-tree-sha1 = "a680b659a1ba99d3663a40aa9acffd67768a410f" uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" -version = "1.15.2" - -[[Polynomials]] -deps = ["Intervals", "LinearAlgebra", "MutableArithmetics", "RecipesBase"] -git-tree-sha1 = "3685cb1e2ccbbb9973684774f956f5c6e4673bc9" -uuid = "f27b6e38-b328-58d1-80ce-0feddd5e7a45" -version = "2.0.12" +version = "1.16.6" -[[Preferences]] +[[deps.Preferences]] deps = ["TOML"] git-tree-sha1 = "00cfd92944ca9c760982747e9a1d0d5d86ab1e5a" uuid = "21216c6a-2e73-6563-6e65-726566657250" version = "1.2.2" -[[Printf]] +[[deps.Printf]] deps = ["Unicode"] uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" -[[REPL]] +[[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" +uuid = "ea2cea3b-5b76-57ae-a6ef-0a8af62496e1" +version = "5.15.3+0" + +[[deps.REPL]] deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"] uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" -[[Random]] +[[deps.Random]] deps = ["Serialization"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" -[[RecipesBase]] +[[deps.RecipesBase]] git-tree-sha1 = "b3fb709f3c97bfc6e948be68beeecb55a0b340ae" uuid = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" version = "1.1.1" -[[RecipesPipeline]] +[[deps.RecipesPipeline]] deps = ["Dates", "NaNMath", "PlotUtils", "RecipesBase"] -git-tree-sha1 = "7a5026a6741c14147d1cb6daf2528a77ca28eb51" +git-tree-sha1 = "9b8e57e3cca8828a1bc759840bfe48d64db9abfb" uuid = "01d81517-befc-4cb6-b9ec-a95719d0359c" -version = "0.3.2" +version = "0.3.3" -[[Reexport]] +[[deps.Reexport]] git-tree-sha1 = "5f6c21241f0f655da3952fd60aa18477cf96c220" uuid = "189a3867-3050-52da-a836-e630ba90ab69" version = "1.1.0" -[[Requires]] +[[deps.Requires]] deps = ["UUIDs"] git-tree-sha1 = "4036a3bd08ac7e968e27c203d45f5fff15020621" uuid = "ae029012-a4dd-5104-9daa-d747884805df" version = "1.1.3" -[[SHA]] +[[deps.SHA]] uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" -[[Scratch]] +[[deps.Scratch]] deps = ["Dates"] git-tree-sha1 = "0b4b7f1393cff97c33891da2a0bf69c6ed241fda" uuid = "6c6a2e73-6563-6170-7368-637461726353" version = "1.1.0" -[[Serialization]] +[[deps.Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" -[[SharedArrays]] +[[deps.SharedArrays]] deps = ["Distributed", "Mmap", "Random", "Serialization"] uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383" -[[Showoff]] +[[deps.Showoff]] deps = ["Dates", "Grisu"] git-tree-sha1 = "91eddf657aca81df9ae6ceb20b959ae5653ad1de" uuid = "992d4aef-0814-514b-bc4d-f2e9a6c4116f" version = "1.0.3" -[[SimpleTraits]] -deps = ["InteractiveUtils", "MacroTools"] -git-tree-sha1 = "daf7aec3fe3acb2131388f93a4c409b8c7f62226" -uuid = "699a6c99-e7fa-54fc-8d76-47d257e15c1d" -version = "0.9.3" - -[[Sockets]] +[[deps.Sockets]] uuid = "6462fe0b-24de-5631-8697-dd941f90decc" -[[SortingAlgorithms]] +[[deps.SortingAlgorithms]] deps = ["DataStructures"] git-tree-sha1 = "2ec1962eba973f383239da22e75218565c390a96" uuid = "a2af1166-a08f-5f64-846c-94a0d3cef48c" version = "1.0.0" -[[SparseArrays]] +[[deps.SparseArrays]] deps = ["LinearAlgebra", "Random"] uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" -[[SpecialFunctions]] -deps = ["ChainRulesCore", "LogExpFunctions", "OpenSpecFun_jll"] -git-tree-sha1 = "a50550fa3164a8c46747e62063b4d774ac1bcf49" -uuid = "276daf66-3868-5448-9aa4-cd146d93841b" -version = "1.5.1" - -[[StaticArrays]] +[[deps.StaticArrays]] deps = ["LinearAlgebra", "Random", "Statistics"] git-tree-sha1 = "745914ebcd610da69f3cb6bf76cb7bb83dcb8c9a" uuid = "90137ffa-7385-5640-81b9-e52037218182" version = "1.2.4" -[[Statistics]] +[[deps.Statistics]] deps = ["LinearAlgebra", "SparseArrays"] uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" -[[StatsAPI]] +[[deps.StatsAPI]] git-tree-sha1 = "1958272568dc176a1d881acb797beb909c785510" uuid = "82ae8749-77ed-4fe6-ae5f-f523153014b0" version = "1.0.0" -[[StatsBase]] +[[deps.StatsBase]] deps = ["DataAPI", "DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"] git-tree-sha1 = "2f6792d523d7448bbe2fec99eca9218f06cc746d" uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" version = "0.33.8" -[[StructArrays]] +[[deps.StructArrays]] deps = ["Adapt", "DataAPI", "Tables"] git-tree-sha1 = "44b3afd37b17422a62aea25f04c1f7e09ce6b07f" uuid = "09ab397b-f2b6-538f-b94a-2f83cf4a842a" version = "0.5.1" -[[TOML]] +[[deps.TOML]] deps = ["Dates"] uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76" -[[TableTraits]] +[[deps.TableTraits]] deps = ["IteratorInterfaceExtensions"] git-tree-sha1 = "c06b2f539df1c6efa794486abfb6ed2022561a39" uuid = "3783bdb8-4a98-5b6b-af9a-565f29a5fe9c" version = "1.0.1" -[[Tables]] +[[deps.Tables]] deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"] -git-tree-sha1 = "aa30f8bb63f9ff3f8303a06c604c8500a69aa791" +git-tree-sha1 = "8ed4a3ea724dac32670b062be3ef1c1de6773ae8" uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" -version = "1.4.3" +version = "1.4.4" -[[Tar]] +[[deps.Tar]] deps = ["ArgTools", "SHA"] uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e" -[[Test]] +[[deps.Test]] deps = ["InteractiveUtils", "Logging", "Random", "Serialization"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" -[[TimeZones]] -deps = ["Dates", "EzXML", "LazyArtifacts", "Mocking", "Pkg", "Printf", "RecipesBase", "Serialization", "Unicode"] -git-tree-sha1 = "960099aed321e05ac649c90d583d59c9309faee1" -uuid = "f269a46b-ccf7-5d73-abea-4c690281aa53" -version = "1.5.5" +[[deps.URIs]] +git-tree-sha1 = "97bbe755a53fe859669cd907f2d96aee8d2c1355" +uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4" +version = "1.3.0" -[[UUIDs]] +[[deps.UUIDs]] deps = ["Random", "SHA"] uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" -[[Unicode]] +[[deps.Unicode]] uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" -[[XML2_jll]] +[[deps.Wayland_jll]] +deps = ["Artifacts", "Expat_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Pkg", "XML2_jll"] +git-tree-sha1 = "3e61f0b86f90dacb0bc0e73a0c5a83f6a8636e23" +uuid = "a2964d1f-97da-50d4-b82a-358c7fce9d89" +version = "1.19.0+0" + +[[deps.Wayland_protocols_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Wayland_jll"] +git-tree-sha1 = "2839f1c1296940218e35df0bbb220f2a79686670" +uuid = "2381bf8a-dfd0-557d-9999-79630e7b1b91" +version = "1.18.0+4" + +[[deps.XML2_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "Zlib_jll"] git-tree-sha1 = "1acf5bdf07aa0907e0a37d3718bb88d4b687b74a" uuid = "02c8fc9c-b97f-50b9-bbe4-9be30ff0a78a" version = "2.9.12+0" -[[XSLT_jll]] +[[deps.XSLT_jll]] 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.34+0" -[[Xorg_libX11_jll]] +[[deps.Xorg_libX11_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libxcb_jll", "Xorg_xtrans_jll"] git-tree-sha1 = "5be649d550f3f4b95308bf0183b82e2582876527" uuid = "4f6342f7-b3d2-589e-9d20-edeb45f2b2bc" version = "1.6.9+4" -[[Xorg_libXau_jll]] +[[deps.Xorg_libXau_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "4e490d5c960c314f33885790ed410ff3a94ce67e" uuid = "0c0b7dd1-d40b-584c-a123-a41640f87eec" version = "1.0.9+4" -[[Xorg_libXdmcp_jll]] +[[deps.Xorg_libXcursor_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libXfixes_jll", "Xorg_libXrender_jll"] +git-tree-sha1 = "12e0eb3bc634fa2080c1c37fccf56f7c22989afd" +uuid = "935fb764-8cf2-53bf-bb30-45bb1f8bf724" +version = "1.2.0+4" + +[[deps.Xorg_libXdmcp_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "4fe47bd2247248125c428978740e18a681372dd4" uuid = "a3789734-cfe1-5b06-b2d0-1dd0d9d62d05" version = "1.1.3+4" -[[Xorg_libXext_jll]] +[[deps.Xorg_libXext_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll"] git-tree-sha1 = "b7c0aa8c376b31e4852b360222848637f481f8c3" uuid = "1082639a-0dae-5f34-9b06-72781eeb8cb3" version = "1.3.4+4" -[[Xorg_libXrender_jll]] +[[deps.Xorg_libXfixes_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll"] +git-tree-sha1 = "0e0dc7431e7a0587559f9294aeec269471c991a4" +uuid = "d091e8ba-531a-589c-9de9-94069b037ed8" +version = "5.0.3+4" + +[[deps.Xorg_libXi_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libXext_jll", "Xorg_libXfixes_jll"] +git-tree-sha1 = "89b52bc2160aadc84d707093930ef0bffa641246" +uuid = "a51aa0fd-4e3c-5386-b890-e753decda492" +version = "1.7.10+4" + +[[deps.Xorg_libXinerama_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libXext_jll"] +git-tree-sha1 = "26be8b1c342929259317d8b9f7b53bf2bb73b123" +uuid = "d1454406-59df-5ea1-beac-c340f2130bc3" +version = "1.1.4+4" + +[[deps.Xorg_libXrandr_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libXext_jll", "Xorg_libXrender_jll"] +git-tree-sha1 = "34cea83cb726fb58f325887bf0612c6b3fb17631" +uuid = "ec84b674-ba8e-5d96-8ba1-2a689ba10484" +version = "1.5.2+4" + +[[deps.Xorg_libXrender_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll"] git-tree-sha1 = "19560f30fd49f4d4efbe7002a1037f8c43d43b96" uuid = "ea2f1a96-1ddc-540d-b46f-429655e07cfa" version = "0.9.10+4" -[[Xorg_libpthread_stubs_jll]] +[[deps.Xorg_libpthread_stubs_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "6783737e45d3c59a4a4c4091f5f88cdcf0908cbb" uuid = "14d82f49-176c-5ed1-bb49-ad3f5cbd8c74" version = "0.1.0+3" -[[Xorg_libxcb_jll]] +[[deps.Xorg_libxcb_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "XSLT_jll", "Xorg_libXau_jll", "Xorg_libXdmcp_jll", "Xorg_libpthread_stubs_jll"] git-tree-sha1 = "daf17f441228e7a3833846cd048892861cff16d6" uuid = "c7cfdc94-dc32-55de-ac96-5a1b8d977c5b" version = "1.13.0+3" -[[Xorg_xtrans_jll]] +[[deps.Xorg_libxkbfile_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll"] +git-tree-sha1 = "926af861744212db0eb001d9e40b5d16292080b2" +uuid = "cc61e674-0454-545c-8b26-ed2c68acab7a" +version = "1.1.0+4" + +[[deps.Xorg_xcb_util_image_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xcb_util_jll"] +git-tree-sha1 = "0fab0a40349ba1cba2c1da699243396ff8e94b97" +uuid = "12413925-8142-5f55-bb0e-6d7ca50bb09b" +version = "0.4.0+1" + +[[deps.Xorg_xcb_util_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libxcb_jll"] +git-tree-sha1 = "e7fd7b2881fa2eaa72717420894d3938177862d1" +uuid = "2def613f-5ad1-5310-b15b-b15d46f528f5" +version = "0.4.0+1" + +[[deps.Xorg_xcb_util_keysyms_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xcb_util_jll"] +git-tree-sha1 = "d1151e2c45a544f32441a567d1690e701ec89b00" +uuid = "975044d2-76e6-5fbe-bf08-97ce7c6574c7" +version = "0.4.0+1" + +[[deps.Xorg_xcb_util_renderutil_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xcb_util_jll"] +git-tree-sha1 = "dfd7a8f38d4613b6a575253b3174dd991ca6183e" +uuid = "0d47668e-0667-5a69-a72c-f761630bfb7e" +version = "0.3.9+1" + +[[deps.Xorg_xcb_util_wm_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xcb_util_jll"] +git-tree-sha1 = "e78d10aab01a4a154142c5006ed44fd9e8e31b67" +uuid = "c22f9ab0-d5fe-5066-847c-f4bb1cd4e361" +version = "0.4.1+1" + +[[deps.Xorg_xkbcomp_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libxkbfile_jll"] +git-tree-sha1 = "4bcbf660f6c2e714f87e960a171b119d06ee163b" +uuid = "35661453-b289-5fab-8a00-3d9160c6a3a4" +version = "1.4.2+4" + +[[deps.Xorg_xkeyboard_config_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xkbcomp_jll"] +git-tree-sha1 = "5c8424f8a67c3f2209646d4425f3d415fee5931d" +uuid = "33bec58e-1273-512f-9401-5d533626f822" +version = "2.27.0+4" + +[[deps.Xorg_xtrans_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "79c31e7844f6ecf779705fbc12146eb190b7d845" uuid = "c5fb5394-a638-5e4d-96e5-b29de1b5cf10" version = "1.4.0+3" -[[Zlib_jll]] +[[deps.Zlib_jll]] deps = ["Libdl"] uuid = "83775a58-1f1d-513f-b197-d71354ab007a" -[[libass_jll]] -deps = ["Artifacts", "Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "HarfBuzz_jll", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"] -git-tree-sha1 = "5982a94fcba20f02f42ace44b9894ee2b140fe47" +[[deps.Zstd_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "cc4bf3fdde8b7e3e9fa0351bdeedba1cf3b7f6e6" +uuid = "3161d3a3-bdf6-5164-811a-617609db77b4" +version = "1.5.0+0" + +[[deps.libass_jll]] +deps = ["Artifacts", "Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"] +git-tree-sha1 = "acc685bcf777b2202a904cdcb49ad34c2fa1880c" uuid = "0ac62f75-1d6f-5e53-bd7c-93b484bb37c0" -version = "0.15.1+0" +version = "0.14.0+4" + +[[deps.libblastrampoline_jll]] +deps = ["Artifacts", "Libdl", "OpenBLAS_jll", "Pkg"] +uuid = "8e850b90-86db-534c-a0d3-1478176c7d93" -[[libfdk_aac_jll]] +[[deps.libfdk_aac_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "daacc84a041563f965be61859a36e17c4e4fcd55" +git-tree-sha1 = "7a5780a0d9c6864184b3a2eeeb833a0c871f00ab" uuid = "f638f0a6-7fb0-5443-88ba-1cc74229b280" -version = "2.0.2+0" +version = "0.1.6+4" -[[libpng_jll]] +[[deps.libpng_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"] git-tree-sha1 = "94d180a6d2b5e55e447e2d27a29ed04fe79eb30c" uuid = "b53b4c65-9356-5827-b1ea-8c7a1a84506f" version = "1.6.38+0" -[[libvorbis_jll]] +[[deps.libvorbis_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Ogg_jll", "Pkg"] git-tree-sha1 = "c45f4e40e7aafe9d086379e5578947ec8b95a8fb" uuid = "f27f6e37-5d2b-51aa-960f-b287f2bc3b7a" version = "1.3.7+0" -[[nghttp2_jll]] +[[deps.nghttp2_jll]] deps = ["Artifacts", "Libdl"] uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d" -[[p7zip_jll]] +[[deps.p7zip_jll]] deps = ["Artifacts", "Libdl"] uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0" -[[x264_jll]] +[[deps.x264_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "4fea590b89e6ec504593146bf8b988b2c00922b2" +git-tree-sha1 = "d713c1ce4deac133e3334ee12f4adff07f81778f" uuid = "1270edf5-f2f9-52d2-97e9-ab00b5d0237a" -version = "2021.5.5+0" +version = "2020.7.14+2" -[[x265_jll]] +[[deps.x265_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "ee567a171cce03570d77ad3a43e90218e38937a9" +git-tree-sha1 = "487da2f8f2f0c8ee0e83f39d13037d6bbf0a45ab" uuid = "dfaa095f-4041-5dcd-9319-2fabd8486b76" -version = "3.5.0+0" +version = "3.0.0+3" + +[[deps.xkbcommon_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Wayland_jll", "Wayland_protocols_jll", "Xorg_libxcb_jll", "Xorg_xkeyboard_config_jll"] +git-tree-sha1 = "ece2350174195bb31de1a63bea3a41ae1aa593b6" +uuid = "d8fb68d0-12a3-5cfd-a85a-d49703b185fd" +version = "0.9.1+5" diff --git a/test/Project.toml b/test/Project.toml index 2e6747e..1036376 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -1,8 +1,3 @@ [deps] -DSP = "717857b8-e6f2-59f4-9121-6e50c889abd2" -FFMPEG = "c87230d0-a227-11e9-1b43-d7ebe4e7570a" -FFMPEG_jll = "b22a6f82-2f65-5046-a5b2-351ab43fb4e5" -LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d" Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" -RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" diff --git a/test/run_process_test.jl b/test/run_process_test.jl index 5998a21..f5f31ad 100644 --- a/test/run_process_test.jl +++ b/test/run_process_test.jl @@ -11,14 +11,11 @@ NOTE: All process output goes to the same file, and can be overwritten by and run those separately. """ function runno(iter) - #procs = [run(pipeline(`julia -E include("test_$(first(iter)).jl")`; stderr = "stderr.txt", stdout="stdout.txt"))] - #procs = [run(`julia -E include\(\"test_$(first(iter)).jl\"\)`)] - procs = [run(pipeline(`julia -E include\(\"test_$(first(iter)).jl\"\)`; stderr = "stderr_$(first(iter)).txt", stdout="stdout_$(first(iter)).txt"); wait = false)] + procs = [run(pipeline(`julia -E include\(\"test_$(first(iter)).jl\"\)`; stderr = "stderr_$(first(iter)).txt", stdout="stderr_$(first(iter)).txt"); wait = false)] for i in iter[2:end] - #push!(procs, run(pipeline(`julia -E include("test_$i.jl")`; stderr = "stderr.txt", stdout="stdout.txt"); wait = false)) push!(procs, run(pipeline( `julia -E include\(\"test_$i.jl\"\)`; - stderr = "stderr_$i.txt", stdout="stdout_$i.txt") + stderr = "stderr_$i.txt", stdout="stderr_$i.txt") ; wait = false)) end procs diff --git a/test/test_11.png b/test/test_11.png deleted file mode 100644 index 792edfb..0000000 Binary files a/test/test_11.png and /dev/null differ diff --git a/test/test_20.png b/test/test_20.png index 12a26ed..2741e0d 100644 Binary files a/test/test_20.png and b/test/test_20.png differ diff --git a/test/test_21.png b/test/test_21.png index df26052..a99745e 100644 Binary files a/test/test_21.png and b/test/test_21.png differ diff --git a/test/test_22.png b/test/test_22.png index aacb810..d194ad4 100644 Binary files a/test/test_22.png and b/test/test_22.png differ diff --git a/test/test_23.jl b/test/test_23.jl index 020bd15..6989d0c 100644 --- a/test/test_23.jl +++ b/test/test_23.jl @@ -1,3 +1,4 @@ +#= ForwardDiff is removed from dependencies in this version. import MechanicalSketch import MechanicalSketch: color_with_lumin, background, O, WI, HE, EM, FS, finish, PALETTE, color_from_palette, setfont, settext, empty_figure, sethue, @layer @@ -97,4 +98,5 @@ dimension_aligned(OB + p_vortex, OB) dimension_aligned(OB + (-physwidth / 2, - physheight / 2 ), OB + (-physwidth / 2, physheight / 2 )) finish() -end #let \ No newline at end of file +end #let +=# \ No newline at end of file diff --git a/test/test_23.png b/test/test_23.png deleted file mode 100644 index dac0a8e..0000000 Binary files a/test/test_23.png and /dev/null differ diff --git a/test/test_24.jl b/test/test_24.jl index 0f64db9..eab4e81 100644 --- a/test/test_24.jl +++ b/test/test_24.jl @@ -1,3 +1,4 @@ +#= ForwardDiff as a dependency is removed from this version import MechanicalSketch import MechanicalSketch: color_with_lumin, sethue, O, WI, EM, FS, HE, finish, background import MechanicalSketch: PALETTE, setfont, settext @@ -150,4 +151,5 @@ settext(str, O + (1.5m, -3.5m), markup = true) end # Let finish() -set_scale_sketch() \ No newline at end of file +set_scale_sketch() +=# \ No newline at end of file diff --git a/test/test_24.png b/test/test_24.png deleted file mode 100644 index ba6d2c3..0000000 Binary files a/test/test_24.png and /dev/null differ diff --git a/test/test_25.jl b/test/test_25.jl index 24f0cf5..8ab1239 100644 --- a/test/test_25.jl +++ b/test/test_25.jl @@ -1,3 +1,4 @@ +#= ForwardDiff is removed from dependencies in this version. import MechanicalSketch import MechanicalSketch: color_with_lumin, O, WI, HE, EM, FS, finish import MechanicalSketch: PALETTE, setfont, settext, background, empty_figure, sethue, move, do_action @@ -81,4 +82,5 @@ str = "The grey image below is a first attempt at LIC flow visualization.\nStre settext(str, O + (-WI / 2 + EM, + 1.8EM ), markup = true) finish() -end # begin \ No newline at end of file +end # begin +=# \ No newline at end of file diff --git a/test/test_25.png b/test/test_25.png deleted file mode 100644 index f2cc48e..0000000 Binary files a/test/test_25.png and /dev/null differ diff --git a/test/test_26.jl b/test/test_26.jl index 1e8b655..4837da7 100644 --- a/test/test_26.jl +++ b/test/test_26.jl @@ -1,3 +1,4 @@ +#= ForwardDiff is removed from dependencies in this version. import MechanicalSketch import MechanicalSketch: empty_figure, finish import MechanicalSketch: PALETTE, settext, setline, WI, EM, HE, O @@ -85,4 +86,5 @@ settext(str, O + (-WI/2 + EM, 2 * EM) , markup = true) finish() set_scale_sketch() -end \ No newline at end of file +end +=# \ No newline at end of file diff --git a/test/test_26.png b/test/test_26.png deleted file mode 100644 index 62773a1..0000000 Binary files a/test/test_26.png and /dev/null differ diff --git a/test/test_27.jl b/test/test_27.jl index 1188025..54a7f83 100644 --- a/test/test_27.jl +++ b/test/test_27.jl @@ -1,3 +1,4 @@ +#= ForwardDiff is removed from dependencies in this version. import MechanicalSketch import MechanicalSketch: empty_figure, background, sethue, O, WI, HE, EM, FS, finish import MechanicalSketch: PALETTE, settext, setline @@ -95,3 +96,4 @@ finish() set_scale_sketch() nothing end +=# \ No newline at end of file diff --git a/test/test_27.png b/test/test_27.png deleted file mode 100644 index b20372b..0000000 Binary files a/test/test_27.png and /dev/null differ diff --git a/test/test_28.png b/test/test_28.png index df6bf2b..76b6fbc 100644 Binary files a/test/test_28.png and b/test/test_28.png differ diff --git a/test/test_29.jl b/test/test_29.jl index 5a8a376..2e9aab3 100644 --- a/test/test_29.jl +++ b/test/test_29.jl @@ -1,3 +1,4 @@ +#= DSP is removed from test dependencies in this version. import MechanicalSketch import MechanicalSketch: empty_figure, PALETTE, O, HE, WI, EM, finish, ∙, Point import MechanicalSketch: @import_expand, set_scale_sketch, settext, scale_pt_to_unit @@ -100,3 +101,4 @@ settext(" finish() set_scale_sketch() #end +=# \ No newline at end of file diff --git a/test/test_29.png b/test/test_29.png deleted file mode 100644 index 827a345..0000000 Binary files a/test/test_29.png and /dev/null differ diff --git a/test/test_30.jl b/test/test_30.jl index c7327c9..a03c520 100644 --- a/test/test_30.jl +++ b/test/test_30.jl @@ -1,3 +1,4 @@ +#= DSP is removed from test dependencies in this version. import MechanicalSketch import MechanicalSketch: empty_figure, PALETTE, O, HE, WI, EM, finish, ∙, Point import MechanicalSketch: @import_expand, set_scale_sketch, scale_pt_to_unit, settext @@ -115,3 +116,4 @@ end finish() end +=# \ No newline at end of file diff --git a/test/test_30.png b/test/test_30.png deleted file mode 100644 index 4f76aad..0000000 Binary files a/test/test_30.png and /dev/null differ diff --git a/test/test_31.png b/test/test_31.png index e90d5fa..b6814b3 100644 Binary files a/test/test_31.png and b/test/test_31.png differ diff --git a/test/test_32.jl b/test/test_32.jl index 8702898..453b1a4 100644 --- a/test/test_32.jl +++ b/test/test_32.jl @@ -1,3 +1,4 @@ +#= ForwardDiff as a dependency is removed from this version import MechanicalSketch import MechanicalSketch: background, sethue, O, WI, HE, EM, FS import MechanicalSketch: PALETTE, setfont, settext, setline, fontsize, color_with_lumin, color_with_lumin @@ -148,4 +149,5 @@ animate(movie, scenes, pathname = joinpath(@__DIR__, "test_32.gif"), framerate = 30) set_scale_sketch(m) -end # let \ No newline at end of file +end # let +=# \ No newline at end of file diff --git a/test/test_33.jl b/test/test_33.jl index 95ffaf2..d7fd795 100644 --- a/test/test_33.jl +++ b/test/test_33.jl @@ -1,3 +1,4 @@ +#= ForwardDiff is removed as a dependency from this version import MechanicalSketch import MechanicalSketch: empty_figure, PALETTE, O, HE, WI, EM, finish, ∙, settext import MechanicalSketch: @import_expand, set_scale_sketch, color_with_lumin @@ -128,4 +129,5 @@ settext(str, ulp, markup = true) set_scale_sketch(m) finish() -end # let \ No newline at end of file +end # let +=# \ No newline at end of file diff --git a/test/test_33.png b/test/test_33.png deleted file mode 100644 index 23d1563..0000000 Binary files a/test/test_33.png and /dev/null differ diff --git a/test/test_34.jl b/test/test_34.jl index aaaf52e..90e6372 100644 --- a/test/test_34.jl +++ b/test/test_34.jl @@ -1,3 +1,4 @@ +#= ForwardDiff is removed as a dependency in this version. import MechanicalSketch import MechanicalSketch: PALETTE, O, HE, WI, EM, FS, PT, ∙, settext import MechanicalSketch: @import_expand, set_scale_sketch @@ -139,4 +140,5 @@ animate(movie, scenes; pathname = joinpath(@__DIR__, "test_34.png"), framerate = framerate * s) -end # Let \ No newline at end of file +end # Let +=# \ No newline at end of file diff --git a/test/test_34.png b/test/test_34.png deleted file mode 100644 index bba31cb..0000000 Binary files a/test/test_34.png and /dev/null differ diff --git a/test/test_35.png b/test/test_35.png index 6a267f1..bbb4b11 100644 Binary files a/test/test_35.png and b/test/test_35.png differ diff --git a/test/test_36.png b/test/test_36.png index a9ccaf0..eabfab2 100644 Binary files a/test/test_36.png and b/test/test_36.png differ diff --git a/test/test_37.png b/test/test_37.png index f599365..0820975 100644 Binary files a/test/test_37.png and b/test/test_37.png differ diff --git a/test/test_38.jl b/test/test_38.jl index 7fa9a96..b10a12c 100644 --- a/test/test_38.jl +++ b/test/test_38.jl @@ -1,3 +1,4 @@ +#= ForwardDiff is removed as a dependency from this version import MechanicalSketch: @import_expand, empty_figure, WI, HE, EM, O, PT, finish import MechanicalSketch: settext, place_image, PALETTE, color_with_lumin, snapshot import MechanicalSketch: circle, ∙, arrow_nofill, Point, @layer, sethue, draw_expr @@ -164,6 +165,6 @@ end snapshot(fname = joinpath(@__DIR__, "test_38.png")) - +=# diff --git a/test/test_38.png b/test/test_38.png deleted file mode 100644 index 5fd611a..0000000 Binary files a/test/test_38.png and /dev/null differ diff --git a/test/test_39.png b/test/test_39.png index 6a1e18a..35d8def 100644 Binary files a/test/test_39.png and b/test/test_39.png differ diff --git a/test/test_40.jl b/test/test_40.jl index c9d966b..f841dc8 100644 --- a/test/test_40.jl +++ b/test/test_40.jl @@ -1,3 +1,4 @@ +#= ForwardDiff is removed as a dependency from this revision. using Revise import MechanicalSketch: @import_expand, empty_figure, WI, HE, EM, O, PT, FS, finish import MechanicalSketch: settext, place_image, PALETTE, color_with_lumin, circle, line @@ -97,3 +98,4 @@ snapshot() end snapshot(fname = joinpath(@__DIR__, "test_40.png")) +=# \ No newline at end of file diff --git a/test/test_40.png b/test/test_40.png deleted file mode 100644 index ad00ba9..0000000 Binary files a/test/test_40.png and /dev/null differ diff --git a/test/test_41.jl b/test/test_41.jl index ff23fef..b4e01da 100644 --- a/test/test_41.jl +++ b/test/test_41.jl @@ -1,3 +1,4 @@ +#= ForwardDiff is removed as a dependency from this version using Revise import MechanicalSketch: @import_expand, empty_figure, WI, HE, EM, O, PT, FS, finish import MechanicalSketch: settext, place_image, PALETTE, color_with_lumin, circle, line @@ -79,4 +80,4 @@ for r = 1m:0.2m:60m #snap2 = snapshotrecordingsurface(drec) - +=# diff --git a/test/test_41.png b/test/test_41.png deleted file mode 100644 index d9f1406..0000000 Binary files a/test/test_41.png and /dev/null differ diff --git a/test/test_5.png b/test/test_5.png index af03eb3..bf402d6 100644 Binary files a/test/test_5.png and b/test/test_5.png differ