From f7031f384efa7a1d2a8f518652978668e2d5af3c Mon Sep 17 00:00:00 2001 From: "Martin.Otter@dlr.de" Date: Tue, 15 Jun 2021 10:14:58 +0200 Subject: [PATCH] Adapted to ModiaResult 0.2.0 --- Manifest.toml | 18 +- Project.toml | 4 +- src/ModiaPlot_CairoMakie.jl | 8 +- test/Manifest.toml | 323 +++++++++++++++---- test/Project.toml | 4 + test/runtests.jl | 4 +- test/test_72_ResultDictWithMatrixOfPlotsc.jl | 11 - 7 files changed, 278 insertions(+), 94 deletions(-) delete mode 100644 test/test_72_ResultDictWithMatrixOfPlotsc.jl diff --git a/Manifest.toml b/Manifest.toml index b810495..f3186e5 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -58,9 +58,9 @@ version = "1.0.5" [[CairoMakie]] deps = ["Base64", "Cairo", "Colors", "FFTW", "FileIO", "FreeType", "GeometryBasics", "LinearAlgebra", "Makie", "SHA", "StaticArrays"] -git-tree-sha1 = "13bfc08f345bbcaa73f58bf33e0706828839cc72" +git-tree-sha1 = "a37649a6a08838134a022e7ad374e33180908d48" uuid = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0" -version = "0.5.9" +version = "0.5.10" [[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"] @@ -491,9 +491,9 @@ version = "1.42.0+0" [[Libiconv_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "8d22e127ea9a0917bc98ebd3755c8bd31989381e" +git-tree-sha1 = "42b62845d70a619f063a7da093d995ec8e15e778" uuid = "94ce4f54-9a6c-5748-9c1c-f9c7231a4531" -version = "1.16.1+0" +version = "1.16.1+1" [[Libmount_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -571,6 +571,12 @@ version = "0.4.5" [[Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" +[[ModiaResult]] +deps = ["DataFrames", "DataStructures", "Measurements", "MonteCarloMeasurements", "Pkg", "Tables", "Unitful"] +git-tree-sha1 = "30491bd7ffc12a2e32077a6932dbb013ddbd6539" +uuid = "16a87621-1533-42f6-8e19-4a825980cec2" +version = "0.2.0" + [[MonteCarloMeasurements]] deps = ["Distributed", "Distributions", "LinearAlgebra", "MacroTools", "Random", "RecipesBase", "Requires", "SLEEFPirates", "StaticArrays", "Statistics", "StatsBase", "Test"] git-tree-sha1 = "cdc1eb7c5a1154c15dfe7368f1ca1f693dc40202" @@ -607,9 +613,9 @@ version = "0.4.0" [[OffsetArrays]] deps = ["Adapt"] -git-tree-sha1 = "1381a7142eefd4cd12f052a4d2d790fe21bd1d55" +git-tree-sha1 = "e436bb81d2ce4f01fb02374c4410e5a9229c85f9" uuid = "6fe1bfb0-de20-5000-8ca7-80f57d26f881" -version = "1.9.2" +version = "1.10.0" [[Ogg_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] diff --git a/Project.toml b/Project.toml index c55eacb..ac30361 100644 --- a/Project.toml +++ b/Project.toml @@ -1,13 +1,14 @@ name = "ModiaPlot_CairoMakie" uuid = "9f8f4483-481e-4903-91bb-7ade42e914e0" authors = ["Martin.Otter@dlr.de "] -version = "0.1.0" +version = "0.2.0" [deps] CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0" Colors = "5ae59095-9a9b-59fe-a467-6f913c188581" DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" Measurements = "eff96d63-e80a-5855-80a2-b1b0885c5ab7" +ModiaResult = "16a87621-1533-42f6-8e19-4a825980cec2" MonteCarloMeasurements = "0987c9cc-fe09-11e8-30f0-b96dd679fdca" Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d" @@ -16,6 +17,7 @@ CairoMakie = "0.5" Colors = "0.12, 0.11, 0.10" DataFrames = "0.22, 0.21, 0.20, 0.19" Measurements = "2.5, 2.4, 2.3" +ModiaResult = "0.2" MonteCarloMeasurements = "0.10" Unitful = "1.6, 1.5, 1.4, 1.3" julia = "1.6, 1.5" diff --git a/src/ModiaPlot_CairoMakie.jl b/src/ModiaPlot_CairoMakie.jl index e5c01b6..6ed23bf 100644 --- a/src/ModiaPlot_CairoMakie.jl +++ b/src/ModiaPlot_CairoMakie.jl @@ -7,8 +7,8 @@ module ModiaPlot_CairoMakie const headingSize = 10 const path = dirname(dirname(@__FILE__)) # Absolute path of package directory -const Version = "0.1.0" -const Date = "2021-06-09" +const Version = "0.2.0" +const Date = "2021-06-15" println("Importing ModiaPlot_CairoMakie Version $Version ($Date) - this takes some time due to CairoMakie import") @@ -19,12 +19,12 @@ import MonteCarloMeasurements using Unitful using CairoMakie -include("$(ModiaResult.path)/src_plot/plot.jl") +include("$(ModiaResult.path)/src/plot.jl") const showFigureStringInDiagram = false const callDisplayFunction = false const reusePossible = true -include("$(ModiaResult.path)/src_plot/makie.jl") +include("$(ModiaResult.path)/src/makie.jl") showFigure(figureNumber::Int) = nothing diff --git a/test/Manifest.toml b/test/Manifest.toml index a73becb..93a740d 100644 --- a/test/Manifest.toml +++ b/test/Manifest.toml @@ -1,53 +1,75 @@ # This file is machine-generated - editing it directly is not advised +[[ArgTools]] +uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f" + [[ArrayInterface]] -deps = ["IfElse", "LinearAlgebra", "Requires", "SparseArrays"] -git-tree-sha1 = "ef91c543a3a8094eba9b1f7171258b9ecae87dfa" +deps = ["IfElse", "LinearAlgebra", "Requires", "SparseArrays", "Static"] +git-tree-sha1 = "045ff5e1bc8c6fb1ecb28694abba0a0d55b5f4f5" uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9" -version = "3.0.0" +version = "3.1.17" [[Artifacts]] -deps = ["Pkg"] -git-tree-sha1 = "c30985d8821e0cd73870b17b0ed0ce6dc44cb744" uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" -version = "1.3.0" [[Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" +[[CSV]] +deps = ["Dates", "Mmap", "Parsers", "PooledArrays", "SentinelArrays", "Tables", "Unicode"] +git-tree-sha1 = "b83aa3f513be680454437a0eee21001607e5d983" +uuid = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b" +version = "0.8.5" + [[Calculus]] deps = ["LinearAlgebra"] git-tree-sha1 = "f641eb0a4f00c343bbc32346e1217b86f3ce9dad" uuid = "49dc2e85-a5d0-5ad3-a950-438e2897f1b9" version = "0.5.1" +[[CategoricalArrays]] +deps = ["DataAPI", "Future", "JSON", "Missings", "Printf", "Statistics", "StructTypes", "Unicode"] +git-tree-sha1 = "18d7f3e82c1a80dd38c16453b8fd3f0a7db92f23" +uuid = "324d7699-5711-5eae-9e2f-1d82baa6b597" +version = "0.9.7" + [[ChainRulesCore]] deps = ["Compat", "LinearAlgebra", "SparseArrays"] -git-tree-sha1 = "53fed426c9af1eb68e63b3999e96454c2db79757" +git-tree-sha1 = "d659e42240c2162300b321f05173cab5cc40a5ba" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "0.9.27" +version = "0.10.4" [[Compat]] deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"] -git-tree-sha1 = "919c7f3151e79ff196add81d7f4e45d91bbf420b" +git-tree-sha1 = "e4e2b39db08f967cc1360951f01e8a75ec441cab" uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "3.25.0" +version = "3.30.0" [[CompilerSupportLibraries_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "8e695f735fca77e9708e795eda62afdb869cbb70" +deps = ["Artifacts", "Libdl"] uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" -version = "0.3.4+0" [[ConstructionBase]] -git-tree-sha1 = "a2a6a5fea4d6f730ec4c18a76d27ec10e8ec1c50" +deps = ["LinearAlgebra"] +git-tree-sha1 = "1dc43957fb9a1574fa1b7a449e101bd1fd3a9fb7" uuid = "187b0558-2788-49d3-abe0-74a17ed4e7c9" -version = "1.0.0" +version = "1.2.1" + +[[Crayons]] +git-tree-sha1 = "3f71217b538d7aaee0b69ab47d9b7724ca8afa0d" +uuid = "a8cc5b0e-0ffa-5ad4-8c14-923d3ee1735f" +version = "4.0.4" [[DataAPI]] -git-tree-sha1 = "25ccd31003243d2ce83e474cf11663dddf48035f" +git-tree-sha1 = "dfb3b7e89e395be1e25c2ad6d7690dc29cc53b1d" uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a" -version = "1.4.1" +version = "1.6.0" + +[[DataFrames]] +deps = ["CategoricalArrays", "Compat", "DataAPI", "Future", "InvertedIndices", "IteratorInterfaceExtensions", "LinearAlgebra", "Markdown", "Missings", "PooledArrays", "PrettyTables", "Printf", "REPL", "Reexport", "SortingAlgorithms", "Statistics", "TableTraits", "Tables", "Unicode"] +git-tree-sha1 = "d50972453ef464ddcebdf489d11885468b7b83a3" +uuid = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" +version = "0.22.7" [[DataStructures]] deps = ["Compat", "InteractiveUtils", "OrderedCollections"] @@ -55,6 +77,11 @@ git-tree-sha1 = "4437b64df1e0adccc3e5d1adbc3ac741095e4677" uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" version = "0.18.9" +[[DataValueInterfaces]] +git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6" +uuid = "e2d170a0-9d28-54be-80f0-106bbe20a464" +version = "1.0.0" + [[Dates]] deps = ["Printf"] uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" @@ -69,27 +96,47 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[Distributions]] deps = ["FillArrays", "LinearAlgebra", "PDMats", "Printf", "QuadGK", "Random", "SparseArrays", "SpecialFunctions", "Statistics", "StatsBase", "StatsFuns"] -git-tree-sha1 = "f0e06a5b5ccda38e2fb8f59d91316e657b67047d" +git-tree-sha1 = "013020ec9a5cdf1dd454eba3704dbffa69d3047e" uuid = "31c24e10-a181-5473-b8eb-7969acd0382f" -version = "0.24.12" +version = "0.25.3" + +[[DocStringExtensions]] +deps = ["LibGit2"] +git-tree-sha1 = "a32185f5428d3986f47c2ab78b1f216d5e6cc96f" +uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" +version = "0.8.5" + +[[Downloads]] +deps = ["ArgTools", "LibCURL", "NetworkOptions"] +uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6" [[FillArrays]] deps = ["LinearAlgebra", "Random", "SparseArrays"] -git-tree-sha1 = "50eabdace27aa27b143f65b65e762bb0112a7708" +git-tree-sha1 = "31939159aeb8ffad1d4d8ee44d07f8558273120a" uuid = "1a297f60-69ca-5386-bcde-b61e274b549b" -version = "0.11.1" +version = "0.11.7" + +[[Formatting]] +deps = ["Printf"] +git-tree-sha1 = "8339d61043228fdd3eb658d86c926cb282ae72a8" +uuid = "59287772-0a20-5a39-b81b-1366585eb4c0" +version = "0.4.2" + +[[Future]] +deps = ["Random"] +uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" [[Hwloc]] deps = ["Hwloc_jll"] -git-tree-sha1 = "2e3d1d4ab0e7296354539b2be081f71f4b694c0b" +git-tree-sha1 = "92d99146066c5c6888d5a3abc871e6a214388b91" uuid = "0e44f5e4-bd66-52a0-8798-143a42290a1d" -version = "1.2.0" +version = "2.0.0" [[Hwloc_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "1179250d910c99810d8a7ff55c50c4ed68c77a58" +git-tree-sha1 = "aac91e34ef4c166e0857e3d6052a3467e5732ceb" uuid = "e33a78d0-f292-5ffc-b300-72abe9b543c8" -version = "2.4.0+0" +version = "2.4.1+0" [[IfElse]] git-tree-sha1 = "28e837ff3e7a6c3cdb252ce49fb412c8eb3caeef" @@ -100,15 +147,45 @@ version = "0.1.0" deps = ["Markdown"] uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" +[[InvertedIndices]] +deps = ["Test"] +git-tree-sha1 = "15732c475062348b0165684ffe28e85ea8396afc" +uuid = "41ab1584-1d38-5bbf-9106-f11c6c58b48f" +version = "1.0.0" + +[[IteratorInterfaceExtensions]] +git-tree-sha1 = "a3f24677c21f5bbe9d2a714f95dcd58337fb2856" +uuid = "82899510-4779-5014-852e-03e436cf321d" +version = "1.0.0" + [[JLLWrappers]] -git-tree-sha1 = "a431f5f2ca3f4feef3bd7a5e94b8b8d4f2f647a0" +deps = ["Preferences"] +git-tree-sha1 = "642a199af8b68253517b80bd3bfd17eb4e84df6e" uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" -version = "1.2.0" +version = "1.3.0" + +[[JSON]] +deps = ["Dates", "Mmap", "Parsers", "Unicode"] +git-tree-sha1 = "81690084b6198a2e1da36fcfda16eeca9f9f24e4" +uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" +version = "0.21.1" + +[[LibCURL]] +deps = ["LibCURL_jll", "MozillaCACerts_jll"] +uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21" + +[[LibCURL_jll]] +deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"] +uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0" [[LibGit2]] -deps = ["Printf"] +deps = ["Base64", "NetworkOptions", "Printf", "SHA"] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" +[[LibSSH2_jll]] +deps = ["Artifacts", "Libdl", "MbedTLS_jll"] +uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8" + [[Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" @@ -116,6 +193,12 @@ uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" deps = ["Libdl"] 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]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" @@ -129,11 +212,15 @@ version = "0.5.6" deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" +[[MbedTLS_jll]] +deps = ["Artifacts", "Libdl"] +uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" + [[Measurements]] -deps = ["Calculus", "LinearAlgebra", "RecipesBase", "Requires"] -git-tree-sha1 = "36fc90bfd01438518ed7e438ace8352fc00c6268" +deps = ["Calculus", "LinearAlgebra", "Printf", "RecipesBase", "Requires"] +git-tree-sha1 = "31c8c0569b914111c94dd31149265ed47c238c5b" uuid = "eff96d63-e80a-5855-80a2-b1b0885c5ab7" -version = "2.5.0" +version = "2.6.0" [[Missings]] deps = ["DataAPI"] @@ -144,33 +231,69 @@ version = "0.4.5" [[Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" +[[ModiaResult]] +deps = ["DataFrames", "DataStructures", "Measurements", "MonteCarloMeasurements", "Pkg", "Tables", "Unitful"] +git-tree-sha1 = "30491bd7ffc12a2e32077a6932dbb013ddbd6539" +uuid = "16a87621-1533-42f6-8e19-4a825980cec2" +version = "0.2.0" + [[MonteCarloMeasurements]] deps = ["Distributed", "Distributions", "LinearAlgebra", "MacroTools", "Random", "RecipesBase", "Requires", "SLEEFPirates", "StaticArrays", "Statistics", "StatsBase", "Test"] -git-tree-sha1 = "b7afe11a705b925bacfd595d9cac092c8c0dd2fc" +git-tree-sha1 = "cdc1eb7c5a1154c15dfe7368f1ca1f693dc40202" uuid = "0987c9cc-fe09-11e8-30f0-b96dd679fdca" -version = "0.10.0" +version = "0.10.4" + +[[MozillaCACerts_jll]] +uuid = "14a3606d-f60d-562e-9121-12d972cd8159" + +[[NetworkOptions]] +uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" [[OpenSpecFun_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "9db77584158d0ab52307f8c04f8e7c08ca76b5b3" +git-tree-sha1 = "13652491f6856acfd2db29360e1bbcd4565d04f1" uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e" -version = "0.5.3+4" +version = "0.5.5+0" [[OrderedCollections]] -git-tree-sha1 = "d45739abcfc03b51f6a42712894a593f74c80a23" +git-tree-sha1 = "85f8e6578bf1f9ee0d11e7bb1b1456435479d47c" uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" -version = "1.3.3" +version = "1.4.1" [[PDMats]] -deps = ["LinearAlgebra", "SparseArrays", "SuiteSparse", "Test"] -git-tree-sha1 = "95a4038d1011dfdbde7cecd2ad0ac411e53ab1bc" +deps = ["LinearAlgebra", "SparseArrays", "SuiteSparse"] +git-tree-sha1 = "4dd403333bcf0909341cfe57ec115152f937d7d8" uuid = "90014a1f-27ba-587c-ab20-58faa44d9150" -version = "0.10.1" +version = "0.11.1" + +[[Parsers]] +deps = ["Dates"] +git-tree-sha1 = "c8abc88faa3f7a3950832ac5d6e690881590d6dc" +uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" +version = "1.1.0" [[Pkg]] -deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] +deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"] uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" +[[PooledArrays]] +deps = ["DataAPI", "Future"] +git-tree-sha1 = "cde4ce9d6f33219465b55162811d8de8139c0414" +uuid = "2dfb63ee-cc39-5dd5-95bd-886bf059d720" +version = "1.2.1" + +[[Preferences]] +deps = ["TOML"] +git-tree-sha1 = "00cfd92944ca9c760982747e9a1d0d5d86ab1e5a" +uuid = "21216c6a-2e73-6563-6e65-726566657250" +version = "1.2.2" + +[[PrettyTables]] +deps = ["Crayons", "Formatting", "Markdown", "Reexport", "Tables"] +git-tree-sha1 = "574a6b3ea95f04e8757c0280bb9c29f1a5e35138" +uuid = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d" +version = "0.11.1" + [[Printf]] deps = ["Unicode"] uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" @@ -182,7 +305,7 @@ uuid = "1fd47b50-473d-5c70-9696-f719f8f3bcdc" version = "2.4.1" [[REPL]] -deps = ["InteractiveUtils", "Markdown", "Sockets"] +deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"] uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" [[Random]] @@ -194,32 +317,43 @@ git-tree-sha1 = "b3fb709f3c97bfc6e948be68beeecb55a0b340ae" uuid = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" version = "1.1.1" +[[Reexport]] +git-tree-sha1 = "5f6c21241f0f655da3952fd60aa18477cf96c220" +uuid = "189a3867-3050-52da-a836-e630ba90ab69" +version = "1.1.0" + [[Requires]] deps = ["UUIDs"] -git-tree-sha1 = "cfbac6c1ed70c002ec6361e7fd334f02820d6419" +git-tree-sha1 = "4036a3bd08ac7e968e27c203d45f5fff15020621" uuid = "ae029012-a4dd-5104-9daa-d747884805df" -version = "1.1.2" +version = "1.1.3" [[Rmath]] deps = ["Random", "Rmath_jll"] -git-tree-sha1 = "86c5647b565873641538d8f812c04e4c9dbeb370" +git-tree-sha1 = "bf3188feca147ce108c76ad82c2792c57abe7b1f" uuid = "79098fc4-a85e-5d69-aa6a-4863f24498fa" -version = "0.6.1" +version = "0.7.0" [[Rmath_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "d76185aa1f421306dec73c057aa384bad74188f0" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "68db32dff12bb6127bac73c209881191bf0efbb7" uuid = "f50d1b31-88e8-58de-be2c-1cc44531875f" -version = "0.2.2+1" +version = "0.3.0+0" [[SHA]] uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" [[SLEEFPirates]] -deps = ["IfElse", "Libdl", "VectorizationBase"] -git-tree-sha1 = "3d44bb7517298fd262915924fdc1645c61a6ef17" +deps = ["IfElse", "Static", "VectorizationBase"] +git-tree-sha1 = "18e8cd8007e9b85e2602dafc6eea22d4c1a0aec4" uuid = "476501e8-09a2-5ece-8869-fb82de89a1fa" -version = "0.6.8" +version = "0.6.21" + +[[SentinelArrays]] +deps = ["Dates", "Random"] +git-tree-sha1 = "bc967c221ccdb0b85511709bda96ee489396f544" +uuid = "91c51154-3ec4-41a3-a24f-3f23e20d615c" +version = "1.3.2" [[Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" @@ -242,39 +376,76 @@ deps = ["LinearAlgebra", "Random"] uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [[SpecialFunctions]] -deps = ["ChainRulesCore", "OpenSpecFun_jll"] -git-tree-sha1 = "75394dbe2bd346beeed750fb02baa6445487b862" +deps = ["ChainRulesCore", "LogExpFunctions", "OpenSpecFun_jll"] +git-tree-sha1 = "a50550fa3164a8c46747e62063b4d774ac1bcf49" uuid = "276daf66-3868-5448-9aa4-cd146d93841b" -version = "1.2.1" +version = "1.5.1" + +[[Static]] +deps = ["IfElse"] +git-tree-sha1 = "2740ea27b66a41f9d213561a04573da5d3823d4b" +uuid = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" +version = "0.2.5" [[StaticArrays]] deps = ["LinearAlgebra", "Random", "Statistics"] -git-tree-sha1 = "9da72ed50e94dbff92036da395275ed114e04d49" +git-tree-sha1 = "42378d3bab8b4f57aa1ca443821b752850592668" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "1.0.1" +version = "1.2.2" [[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 = "7bab7d4eb46b225b35179632852b595a3162cb61" +deps = ["DataAPI", "DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"] +git-tree-sha1 = "2f6792d523d7448bbe2fec99eca9218f06cc746d" uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" -version = "0.33.2" +version = "0.33.8" [[StatsFuns]] -deps = ["Rmath", "SpecialFunctions"] -git-tree-sha1 = "3b9f665c70712af3264b61c27a7e1d62055dafd1" +deps = ["LogExpFunctions", "Rmath", "SpecialFunctions"] +git-tree-sha1 = "30cd8c360c54081f806b1ee14d2eecbef3c04c49" uuid = "4c63d2b9-4356-54db-8cca-17b64c39e42c" -version = "0.9.6" +version = "0.9.8" + +[[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" +[[TOML]] +deps = ["Dates"] +uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76" + +[[TableTraits]] +deps = ["IteratorInterfaceExtensions"] +git-tree-sha1 = "c06b2f539df1c6efa794486abfb6ed2022561a39" +uuid = "3783bdb8-4a98-5b6b-af9a-565f29a5fe9c" +version = "1.0.1" + +[[Tables]] +deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"] +git-tree-sha1 = "aa30f8bb63f9ff3f8303a06c604c8500a69aa791" +uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" +version = "1.4.3" + +[[Tar]] +deps = ["ArgTools", "SHA"] +uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e" + [[Test]] -deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] +deps = ["InteractiveUtils", "Logging", "Random", "Serialization"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [[UUIDs]] @@ -285,13 +456,25 @@ uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" [[Unitful]] -deps = ["ConstructionBase", "LinearAlgebra", "Random"] -git-tree-sha1 = "2b643523d52fc9fb4fe0729e6561d066055d58d8" +deps = ["ConstructionBase", "Dates", "LinearAlgebra", "Random"] +git-tree-sha1 = "b3682a0559219355f1e3c8024e9f97adce2d4623" uuid = "1986cc42-f94f-5a68-af5c-568840ba703d" -version = "1.5.0" +version = "1.8.0" [[VectorizationBase]] -deps = ["ArrayInterface", "Hwloc", "IfElse", "Libdl", "LinearAlgebra"] -git-tree-sha1 = "d91a350a40d5b5bb8cebf4c927ae8c2f8b07cce3" +deps = ["ArrayInterface", "Hwloc", "IfElse", "Libdl", "LinearAlgebra", "Static"] +git-tree-sha1 = "7c8974c7de377a2dc67e778017c78f96fc8f0fc6" uuid = "3d5dd08c-fd9d-11e8-17fa-ed2836048c2f" -version = "0.17.1" +version = "0.20.16" + +[[Zlib_jll]] +deps = ["Libdl"] +uuid = "83775a58-1f1d-513f-b197-d71354ab007a" + +[[nghttp2_jll]] +deps = ["Artifacts", "Libdl"] +uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d" + +[[p7zip_jll]] +deps = ["Artifacts", "Libdl"] +uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0" diff --git a/test/Project.toml b/test/Project.toml index 4bc436e..fadba30 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -1,7 +1,11 @@ [deps] +CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b" +DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f" Measurements = "eff96d63-e80a-5855-80a2-b1b0885c5ab7" +ModiaResult = "16a87621-1533-42f6-8e19-4a825980cec2" MonteCarloMeasurements = "0987c9cc-fe09-11e8-30f0-b96dd679fdca" +Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d" diff --git a/test/runtests.jl b/test/runtests.jl index 1f768dc..a978b10 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -5,12 +5,12 @@ using Test ModiaResult.activate("CairoMakie") -include("$(ModiaResult.path)/test_plot/all_tests.jl") +include("$(ModiaResult.path)/test/runtests_withPlot.jl") @testset "test saving of svg file" begin include("test_45_Save_svg_figure.jl") end -ModiaResult.activatePreviousPlotPackage() +ModiaResult.activatePrevious() end \ No newline at end of file diff --git a/test/test_72_ResultDictWithMatrixOfPlotsc.jl b/test/test_72_ResultDictWithMatrixOfPlotsc.jl deleted file mode 100644 index 3d9a063..0000000 --- a/test/test_72_ResultDictWithMatrixOfPlotsc.jl +++ /dev/null @@ -1,11 +0,0 @@ -module test_12_ResultDictWithMatrixOfPlotsc - -import ModiaResult -include("$(ModiaResult.path)/test/test_72_ResultDictWithMatrixOfPlotsb.jl") - -ModiaResult.@usingModiaPlot - -plot(result, [("sigA", "sigB", "sigC"), "r[2:3]"]) -saveFigure(1, "segmented-signals-plot.svg") - -end \ No newline at end of file