diff --git a/Manifest.toml b/Manifest.toml index 873e992..9484809 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -5,9 +5,9 @@ uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f" [[ArrayInterface]] deps = ["Compat", "IfElse", "LinearAlgebra", "Requires", "SparseArrays", "Static"] -git-tree-sha1 = "e527b258413e0c6d4f66ade574744c94edef81f8" +git-tree-sha1 = "1ee88c4c76caa995a885dc2f22a5d548dfbbc0ba" uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9" -version = "3.1.40" +version = "3.2.2" [[Artifacts]] uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" @@ -17,15 +17,15 @@ uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" [[BitTwiddlingConvenienceFunctions]] deps = ["Static"] -git-tree-sha1 = "bc1317f71de8dce26ea67fcdf7eccc0d0693b75b" +git-tree-sha1 = "5e98d6a6aa92e5758c4d58501b7bf23732699fa3" uuid = "62783981-4cbd-42fc-bca8-16325de8dc4b" -version = "0.1.1" +version = "0.1.2" [[CPUSummary]] deps = ["Hwloc", "IfElse", "Static"] -git-tree-sha1 = "87b0c9c6ee0124d6c1f4ce8cb035dcaf9f90b803" +git-tree-sha1 = "ba19d1c8ff6b9c680015033c66802dd817a9cf39" uuid = "2a0fbf3d-bb9c-48f3-b0a9-814d99fd7ab9" -version = "0.1.6" +version = "0.1.7" [[Calculus]] deps = ["LinearAlgebra"] @@ -35,21 +35,21 @@ version = "0.5.1" [[ChainRulesCore]] deps = ["Compat", "LinearAlgebra", "SparseArrays"] -git-tree-sha1 = "f885e7e7c124f8c92650d61b9477b9ac2ee607dd" +git-tree-sha1 = "f9982ef575e19b0e5c7a98c6e75ee496c0f73a93" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "1.11.1" +version = "1.12.0" [[ChangesOfVariables]] -deps = ["LinearAlgebra", "Test"] -git-tree-sha1 = "9a1d594397670492219635b35a3d830b04730d62" +deps = ["ChainRulesCore", "LinearAlgebra", "Test"] +git-tree-sha1 = "bf98fa45a0a4cee295de98d4c1462be26345b9a1" uuid = "9e997f8a-9a97-42d5-a9f1-ce6bfc15e2c0" -version = "0.1.1" +version = "0.1.2" [[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 = "dce3e3fea680869eaa0b774b2e8343e9ff442313" +git-tree-sha1 = "44c37b4636bc54afac5c574d2d02b625349d6582" uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "3.40.0" +version = "3.41.0" [[CompilerSupportLibraries_jll]] deps = ["Artifacts", "Libdl"] @@ -62,9 +62,9 @@ uuid = "187b0558-2788-49d3-abe0-74a17ed4e7c9" version = "1.3.0" [[Crayons]] -git-tree-sha1 = "3f71217b538d7aaee0b69ab47d9b7724ca8afa0d" +git-tree-sha1 = "249fe38abf76d48563e2f4556bebd215aa317e15" uuid = "a8cc5b0e-0ffa-5ad4-8c14-923d3ee1735f" -version = "4.0.4" +version = "4.1.1" [[DataAPI]] git-tree-sha1 = "cc70b17275652eb47bc9e5f81635981f13cea5c8" @@ -73,15 +73,15 @@ version = "1.9.0" [[DataFrames]] deps = ["Compat", "DataAPI", "Future", "InvertedIndices", "IteratorInterfaceExtensions", "LinearAlgebra", "Markdown", "Missings", "PooledArrays", "PrettyTables", "Printf", "REPL", "Reexport", "SortingAlgorithms", "Statistics", "TableTraits", "Tables", "Unicode"] -git-tree-sha1 = "d785f42445b63fc86caa08bb9a9351008be9b765" +git-tree-sha1 = "ae02104e835f219b8930c7664b8012c93475c340" uuid = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" -version = "1.2.2" +version = "1.3.2" [[DataStructures]] deps = ["Compat", "InteractiveUtils", "OrderedCollections"] -git-tree-sha1 = "7d9d316f04214f7efdbb6398d545446e246eff02" +git-tree-sha1 = "3daef5523dd2e769dad2365274f760ff5f282c7d" uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" -version = "0.18.10" +version = "0.18.11" [[DataValueInterfaces]] git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6" @@ -108,9 +108,9 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[Distributions]] deps = ["ChainRulesCore", "DensityInterface", "FillArrays", "LinearAlgebra", "PDMats", "Printf", "QuadGK", "Random", "SparseArrays", "SpecialFunctions", "Statistics", "StatsBase", "StatsFuns", "Test"] -git-tree-sha1 = "dc6f530de935bb3c3cd73e99db5b4698e58b2fcf" +git-tree-sha1 = "2e97190dfd4382499a4ac349e8d316491c9db341" uuid = "31c24e10-a181-5473-b8eb-7969acd0382f" -version = "0.25.31" +version = "0.25.46" [[DocStringExtensions]] deps = ["LibGit2"] @@ -140,9 +140,9 @@ uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" [[HostCPUFeatures]] deps = ["BitTwiddlingConvenienceFunctions", "IfElse", "Libdl", "Static"] -git-tree-sha1 = "8f0dc80088981ab55702b04bba38097a44a1a3a9" +git-tree-sha1 = "3965a3216446a6b020f0d48f1ba94ef9ec01720d" uuid = "3e5b6fbb-0976-4d2c-9146-d79de83f2fb0" -version = "0.1.5" +version = "0.1.6" [[Hwloc]] deps = ["Hwloc_jll"] @@ -152,9 +152,9 @@ version = "2.0.0" [[Hwloc_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "3395d4d4aeb3c9d31f5929d32760d8baeee88aaf" +git-tree-sha1 = "d8bccde6fc8300703673ef9e1383b11403ac1313" uuid = "e33a78d0-f292-5ffc-b300-72abe9b543c8" -version = "2.5.0+0" +version = "2.7.0+0" [[IfElse]] git-tree-sha1 = "debdd00ffef04665ccbb3e150747a77560e8fad1" @@ -188,15 +188,15 @@ version = "1.0.0" [[JLLWrappers]] deps = ["Preferences"] -git-tree-sha1 = "642a199af8b68253517b80bd3bfd17eb4e84df6e" +git-tree-sha1 = "abc9885a7ca2052a736a600f7fa66209f96506e1" uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" -version = "1.3.0" +version = "1.4.1" [[LayoutPointers]] deps = ["ArrayInterface", "LinearAlgebra", "ManualMemory", "SIMDTypes", "Static"] -git-tree-sha1 = "83b56449c39342a47f3fcdb3bc782bd6d66e1d97" +git-tree-sha1 = "6dd77ee76188b0365f7d882d674b95796076fa2c" uuid = "10f19ff3-798f-405d-979b-55457f8fc047" -version = "0.1.4" +version = "0.1.5" [[LibCURL]] deps = ["LibCURL_jll", "MozillaCACerts_jll"] @@ -223,9 +223,9 @@ uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" [[LogExpFunctions]] deps = ["ChainRulesCore", "ChangesOfVariables", "DocStringExtensions", "InverseFunctions", "IrrationalConstants", "LinearAlgebra"] -git-tree-sha1 = "be9eef9f9d78cecb6f262f3c10da151a6c5ab827" +git-tree-sha1 = "e5718a00af0ab9756305a0392832c8952c7426c1" uuid = "2ab3a3ac-af41-5b50-aa03-7779005ae688" -version = "0.3.5" +version = "0.3.6" [[Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" @@ -251,9 +251,9 @@ uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" [[Measurements]] deps = ["Calculus", "LinearAlgebra", "Printf", "RecipesBase", "Requires"] -git-tree-sha1 = "31c8c0569b914111c94dd31149265ed47c238c5b" +git-tree-sha1 = "58390f5617544fb09d27244749484fee0cae6712" uuid = "eff96d63-e80a-5855-80a2-b1b0885c5ab7" -version = "2.6.0" +version = "2.7.0" [[Missings]] deps = ["DataAPI"] @@ -266,9 +266,9 @@ uuid = "a63ad114-7e13-5084-954f-fe012c677804" [[MonteCarloMeasurements]] deps = ["Distributed", "Distributions", "LinearAlgebra", "MacroTools", "Random", "RecipesBase", "Requires", "SLEEFPirates", "StaticArrays", "Statistics", "StatsBase", "Test"] -git-tree-sha1 = "d9dc441d5a0393ee80aea49d0fb13281d7cc7c91" +git-tree-sha1 = "a438746036111a49ba2cb435681aeef0f1d8e9bc" uuid = "0987c9cc-fe09-11e8-30f0-b96dd679fdca" -version = "1.0.3" +version = "1.0.6" [[MozillaCACerts_jll]] uuid = "14a3606d-f60d-562e-9121-12d972cd8159" @@ -309,15 +309,15 @@ version = "1.4.0" [[Preferences]] deps = ["TOML"] -git-tree-sha1 = "00cfd92944ca9c760982747e9a1d0d5d86ab1e5a" +git-tree-sha1 = "2cf929d64681236a2e074ffafb8d568733d2e6af" uuid = "21216c6a-2e73-6563-6e65-726566657250" -version = "1.2.2" +version = "1.2.3" [[PrettyTables]] deps = ["Crayons", "Formatting", "Markdown", "Reexport", "Tables"] -git-tree-sha1 = "d940010be611ee9d67064fe559edbb305f8cc0eb" +git-tree-sha1 = "dfb54c4e414caa595a1f2ed759b160f5a3ddcba5" uuid = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d" -version = "1.2.3" +version = "1.3.1" [[Printf]] deps = ["Unicode"] @@ -338,9 +338,9 @@ deps = ["Serialization"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" [[RecipesBase]] -git-tree-sha1 = "44a75aa7a527910ee3d1751d1f0e4148698add9e" +git-tree-sha1 = "6bf3f380ff52ce0832ddd3a2a7b9538ed1bcca7d" uuid = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" -version = "1.1.2" +version = "1.2.1" [[Reexport]] git-tree-sha1 = "45e428421666073eab6f2da5c9d310d99bb12f9b" @@ -349,9 +349,9 @@ version = "1.2.2" [[Requires]] deps = ["UUIDs"] -git-tree-sha1 = "4036a3bd08ac7e968e27c203d45f5fff15020621" +git-tree-sha1 = "838a3a4188e2ded87a4f9f184b4b0d78a1e91cb7" uuid = "ae029012-a4dd-5104-9daa-d747884805df" -version = "1.1.3" +version = "1.3.0" [[Rmath]] deps = ["Random", "Rmath_jll"] @@ -401,42 +401,42 @@ uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [[SpecialFunctions]] deps = ["ChainRulesCore", "IrrationalConstants", "LogExpFunctions", "OpenLibm_jll", "OpenSpecFun_jll"] -git-tree-sha1 = "f0bccf98e16759818ffc5d97ac3ebf87eb950150" +git-tree-sha1 = "e6bf188613555c78062842777b116905a9f9dd49" uuid = "276daf66-3868-5448-9aa4-cd146d93841b" -version = "1.8.1" +version = "2.1.0" [[Static]] deps = ["IfElse"] -git-tree-sha1 = "e7bc80dc93f50857a5d1e3c8121495852f407e6a" +git-tree-sha1 = "7f5a513baec6f122401abfc8e9c074fdac54f6c1" uuid = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" -version = "0.4.0" +version = "0.4.1" [[StaticArrays]] deps = ["LinearAlgebra", "Random", "Statistics"] -git-tree-sha1 = "3c76dde64d03699e074ac02eb2e8ba8254d428da" +git-tree-sha1 = "a635a9333989a094bddc9f940c04c549cd66afcf" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "1.2.13" +version = "1.3.4" [[Statistics]] deps = ["LinearAlgebra", "SparseArrays"] uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" [[StatsAPI]] -git-tree-sha1 = "0f2aa8e32d511f758a2ce49208181f7733a0936a" +git-tree-sha1 = "d88665adc9bcf45903013af0982e2fd05ae3d0a6" uuid = "82ae8749-77ed-4fe6-ae5f-f523153014b0" -version = "1.1.0" +version = "1.2.0" [[StatsBase]] deps = ["DataAPI", "DataStructures", "LinearAlgebra", "LogExpFunctions", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"] -git-tree-sha1 = "2bb0cb32026a66037360606510fca5984ccc6b75" +git-tree-sha1 = "51383f2d367eb3b444c961d485c565e4c0cf4ba0" uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" -version = "0.33.13" +version = "0.33.14" [[StatsFuns]] deps = ["ChainRulesCore", "InverseFunctions", "IrrationalConstants", "LogExpFunctions", "Reexport", "Rmath", "SpecialFunctions"] -git-tree-sha1 = "385ab64e64e79f0cd7cfcf897169b91ebbb2d6c8" +git-tree-sha1 = "f35e1879a71cca95f4826a14cdbf0b9e253ed918" uuid = "4c63d2b9-4356-54db-8cca-17b64c39e42c" -version = "0.9.13" +version = "0.9.15" [[SuiteSparse]] deps = ["Libdl", "LinearAlgebra", "Serialization", "SparseArrays"] @@ -454,9 +454,9 @@ version = "1.0.1" [[Tables]] deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"] -git-tree-sha1 = "fed34d0e71b91734bf0a7e10eb1bb05296ddbcd0" +git-tree-sha1 = "bb1064c9a84c52e277f1096cf41434b675cd368b" uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" -version = "1.6.0" +version = "1.6.1" [[Tar]] deps = ["ArgTools", "SHA"] @@ -475,15 +475,15 @@ uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" [[Unitful]] deps = ["ConstructionBase", "Dates", "LinearAlgebra", "Random"] -git-tree-sha1 = "0992ed0c3ef66b0390e5752fe60054e5ff93b908" +git-tree-sha1 = "b95e0b8a8d1b6a6c3e0b3ca393a7a285af47c264" uuid = "1986cc42-f94f-5a68-af5c-568840ba703d" -version = "1.9.2" +version = "1.10.1" [[VectorizationBase]] deps = ["ArrayInterface", "CPUSummary", "HostCPUFeatures", "Hwloc", "IfElse", "LayoutPointers", "Libdl", "LinearAlgebra", "SIMDTypes", "Static"] -git-tree-sha1 = "5239606cf3552aff43d79ecc75b1af1ce4625109" +git-tree-sha1 = "e9a35d501b24c127af57ca5228bcfb806eda7507" uuid = "3d5dd08c-fd9d-11e8-17fa-ed2836048c2f" -version = "0.21.21" +version = "0.21.24" [[Zlib_jll]] deps = ["Libdl"] diff --git a/Project.toml b/Project.toml index bab2228..01523ef 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "ModiaResult" uuid = "16a87621-1533-42f6-8e19-4a825980cec2" authors = ["Martin.Otter@dlr.de "] -version = "0.3.8" +version = "0.3.9" [deps] DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" diff --git a/README.md b/README.md index 47bc300..89a15d8 100644 --- a/README.md +++ b/README.md @@ -70,10 +70,10 @@ generate the following plot: ![SegmentedSignalsPlot](docs/resources/images/segmented-signals-plot.png) -# Abstract Result Interface +## Abstract Result Interface For every result data structure a few access functions have to be defined -(for details see Abstract Interface](https://modiasim.github.io/ModiaResult.jl/stable/AbstractInterface.html)). +(for details see [Abstract Interface](https://modiasim.github.io/ModiaResult.jl/stable/AbstractInterface.html)). Most importantly: diff --git a/docs/src/index.md b/docs/src/index.md index f008790..2a4f5cc 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -138,6 +138,15 @@ are different to the Python 2.x version. ## Release Notes + +### Version 0.3.9 + +- Wrong link in README.md corrected +- makie.jl: Adapted to newer Makie version (update!(..) no longer known and needed). +- Issue with ustrip fixed. +- Broken test_52_MonteCarloMeasurementsWithDistributions.jl reactivated +- Manifest.toml updated. + ### Version 0.3.8 - Better handling if some input arguments are `nothing`. diff --git a/src/Utilities.jl b/src/Utilities.jl index 0e1ffc9..9c1b566 100644 --- a/src/Utilities.jl +++ b/src/Utilities.jl @@ -482,7 +482,6 @@ function getSignalDetails(result, name::AbstractString) nScalarSignals = length(sig[1][1]) # "flatten" array to matrix - #= eltypeValue = eltype(value) if !(eltypeValue <: Number) @warn "eltype($name) = $eltypeValue and this is not <: Number!" @@ -498,7 +497,6 @@ function getSignalDetails(result, name::AbstractString) end end end - =# end end end @@ -670,10 +668,9 @@ function getPlotSignal(result, ysigName::AbstractString; xsigName=nothing) #xsig2 = collect(ustrip.(first(xsig))) - #ysig2 = collect(ustrip.(first(ysig))) - - xsig2 = collect(first(xsig)) # Gives suddenly error with ustrip.(first(xsig)) - unclear why + xsig2 = ustrip.(collect(first(xsig))) ysig2 = collect(ustrip.(first(ysig))) + if length(xsig) > 1 xNaN = convert(eltype(xsig2), NaN) if ndims(ysig2) == 1 diff --git a/src/makie.jl b/src/makie.jl index 9969849..b85a6da 100644 --- a/src/makie.jl +++ b/src/makie.jl @@ -346,7 +346,7 @@ function plot(result, names::AbstractMatrix; heading::AbstractString="", grid::B # Update and display fig trim!(fig.layout) - update!(fig.scene) + #update!(fig.scene) if callDisplayFunction display(fig) end diff --git a/test/include_all.jl b/test/include_all.jl index f1e0210..f5c3717 100644 --- a/test/include_all.jl +++ b/test/include_all.jl @@ -16,7 +16,7 @@ include("test_25_SeveralFigures.jl") include("test_26_TooManyLegends.jl") include("test_51_OneScalarMonteCarloMeasurementsSignal.jl") -Test.@test_broken include("test_52_MonteCarloMeasurementsWithDistributions.jl") +include("test_52_MonteCarloMeasurementsWithDistributions.jl") include("test_70_ResultDict.jl") # include("test_71_Tables_Rotational_First.jl") # deactivated, because "using CSV"