From 0da16df5568372e7698b6c2fb6eed79619e1095f Mon Sep 17 00:00:00 2001 From: "Martin.Otter@dlr.de" Date: Fri, 21 Jan 2022 13:00:07 +0100 Subject: [PATCH 01/14] Documentation improved --- Project.toml | 2 +- README.md | 22 +++++ docs/src/index.md | 72 ++++++++++++++- src/Utilities.jl | 216 +++++++++++++++++++++++--------------------- test/include_all.jl | 2 +- 5 files changed, 208 insertions(+), 106 deletions(-) diff --git a/Project.toml b/Project.toml index 541846e..bab2228 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.7" +version = "0.3.8" [deps] DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" diff --git a/README.md b/README.md index 9d07546..47bc300 100644 --- a/README.md +++ b/README.md @@ -70,6 +70,28 @@ generate the following plot: ![SegmentedSignalsPlot](docs/resources/images/segmented-signals-plot.png) +# 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)). +Most importantly: + + +``` +(timeSignal, signal, signalType) = ModiaResult.rawSignal(result, name) +``` + +Given the result data structure `result` and a variable `name::AbstractString`, +return the result values of the independent variable (= `timeSignal`), the +corresponding result values of the variable (= `signal`) and the type +of the signal. The following figure sketches the returned `timeSignal` and `signal` data structures: + +![SignalDefinition](docs/resources/images/signal-definition.png) + +Other signal types might be mapped to this basic signal type by introducing views. + + + ## Main developer [Martin Otter](https://rmc.dlr.de/sr/en/staff/martin.otter/), diff --git a/docs/src/index.md b/docs/src/index.md index 16c0dd6..f008790 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -5,7 +5,9 @@ CurrentModule = ModiaResult ``` Package [ModiaResult](https://github.com/ModiaSim/ModiaResult.jl) defines -an abstract interface for **simulation results** and provides overloaded methods for: +an abstract interface for **simulation results** with a potentially segmented +time axis (on different segments of the time axis, different variables might be defined) +and provides overloaded methods for: - Dictionaries with String keys, @@ -33,6 +35,51 @@ More details: - [Internal](Internal.html) +## Example + +Assume that the result data structure is available, then the following commands + + +```julia +import ModiaResult + +# Define plotting software globally +ModiaResult.activate("PyPlot") # or ENV["MODIA_PLOT"] = "PyPlot" + +# Execute "using ModiaPlot_" +ModiaResult.@usingModiaPlot # = "using ModiaPlot_PyPlot" + +# Generate line plots +plot(result, [("sigA", "sigB", "sigC"), "r[2:3]"]) +``` + +generate the following plot: + +![SegmentedSignalsPlot](../resources/images/segmented-signals-plot.png) + + +## Abstract Result Interface + +For every result data structure a few access functions have to be defined +(for details see [Abstract Interface](AbstractInterface.html)). +Most importantly: + + +``` +(timeSignal, signal, signalType) = ModiaResult.rawSignal(result, name) +``` + +Given the result data structure `result` and a variable `name::AbstractString`, +return the result values of the independent variable (= `timeSignal`), the +corresponding result values of the variable (= `signal`) and the type +of the signal `signalType::`[`SignalType`](@ref)). +The following figure sketches the returned `timeSignal` and `signal` data structures: + +![SignalDefinition](../resources/images/signal-definition.png) + +Other signal types might be mapped to this basic signal type by introducing views. + + ## Installation All packages are registered and are installed with: @@ -91,6 +138,29 @@ are different to the Python 2.x version. ## Release Notes +### Version 0.3.8 + +- Better handling if some input arguments are `nothing`. +- Bug corrected when accessing a vector element, such as `mvec[2]`. +- Documentation slightly improved. + + +### Version 0.3.7 + +- Replaced Point2f0 by Makie_Point2f that needs to be defined according to the newest Makie version. + + +### Version 0.3.6 + +- Adapt to MonteCarloMeasurements, version >= 1.0 (e.g. pmean(..) instead of mean(..)) +- Remove test_71_Tables_Rotational_First.jl from runtests.jl, because "using CSV" + (in order that CSV.jl does not have to be added to the Project.toml file) + + +### Version 0.3.5 + +- Project.toml: Added version 1 of MonteCarloMeasurements. + ### Version 0.3.4 diff --git a/src/Utilities.jl b/src/Utilities.jl index 12404e8..0e1ffc9 100644 --- a/src/Utilities.jl +++ b/src/Utilities.jl @@ -20,7 +20,7 @@ const ModiaPlotPackagesStack = String[] """ usePlotPackage(plotPackage::String) - + Define the ModiaPlot package that shall be used by command `ModiaResult.@usingModiaPlot`. If a ModiaPlot package is already defined, save it on an internal stack (can be reactivated with `usePreviousPlotPackage()`. @@ -86,7 +86,7 @@ end """ usePreviousPlotPackage() - + Pop the last saved ModiaPlot package from an internal stack and call `usePlotPackage()`. """ @@ -104,7 +104,7 @@ end """ currentPlotPackage() - + Return the name of the plot package as a string that was defined with [`usePlotPackage`](@ref). For example, the function may return "GLMakie", "PyPlot" or "NoPlot" or @@ -116,7 +116,7 @@ currentPlotPackage() = haskey(ENV, "MODIA_PLOT") ? ENV["MODIA_PLOT"] : "" """ @usingModiaPlot() - + Execute `using XXX`, where `XXX` is the ModiaPlot package that was activated with `usePlotPackage(plotPackage)`. """ @@ -130,19 +130,19 @@ macro usingModiaPlot() @goto USE_NO_PLOT elseif ModiaPlotPackage == "SilentNoPlot" expr = :( import ModiaResult.SilentNoPlot: plot, showFigure, saveFigure, closeFigure, closeAllFigures ) - return esc( expr ) + return esc( expr ) else ModiaPlotPackage = Symbol("ModiaPlot_" * ModiaPlotPackage) expr = :(using $ModiaPlotPackage) - println("$expr") + println("$expr") return esc( :(using $ModiaPlotPackage) ) end - + else @warn "No plot package activated. Using \"NoPlot\"." @goto USE_NO_PLOT end - + @label USE_NO_PLOT expr = :( import ModiaResult.NoPlot: plot, showFigure, saveFigure, closeFigure, closeAllFigures ) println("$expr") @@ -168,7 +168,7 @@ function resultInfo(result) @info "The call of showInfo(result) is ignored, since the argument is nothing." return end - + resultInfoTable = DataFrames.DataFrame(name=String[], unit=String[], nTime=String[], signalType=String[], valueSize=String[], eltype=String[]) timeSigName = timeSignalName(result) @@ -182,16 +182,16 @@ function resultInfo(result) elType2 = "???" else - sigUnit2 = string(sigUnit) + sigUnit2 = sigUnit isa Nothing ? "???" : string(sigUnit) nTime2 = name==timeSigName && !hasOneTimeSignal(result) ? "---" : string(nTime) signalType2 = signalTypeToString[Int(signalType)] - valueSize2 = string(valueSize) + valueSize2 = valueSize isa Nothing ? "()" : string(valueSize) elType2 = string(elType) end - + push!(resultInfoTable, [name, sigUnit2, nTime2, signalType2, valueSize2, elType2] ) - end - + end + return resultInfoTable end @@ -199,7 +199,7 @@ end """ printResultInfo(result) - + Print info about result. # Example @@ -213,17 +213,17 @@ result = OrderedDict{String,Any}("time"=> t*u"s", "phi" => sin.(t)*u"rad") printResultInfo(result) # Gives output: - # │ name unit nTime signalType valueSize eltype + # │ name unit nTime signalType valueSize eltype ───┼─────────────────────────────────────────────────── 1 │ time s 100 Independent () Float64 2 │ phi rad 100 Continuous () Float64 -``` +``` """ function printResultInfo(result)::Nothing resultInfoTable = resultInfo(result) - show(stdout, resultInfoTable, summary=false, rowlabel=Symbol("#"), allcols=true, eltypes=false, truncate=50) - println(stdout) + show(stdout, resultInfoTable, summary=false, rowlabel=Symbol("#"), allcols=true, eltypes=false, truncate=50) + println(stdout) return nothing end @@ -231,7 +231,7 @@ end """ ResultDict(args...; defaultHeading="", hasOneTimeSignal=true) - + Return a new ResultDict dictionary (is based on OrderedCollections.OrderedDict). - A key of the dictionary is a String. Key `"time"` characterizes the @@ -257,13 +257,13 @@ time3 = 5.0 : 0.1 : 7.0 sigA1 = sin.(time1)u"m" sigA2 = cos.(time2)u"m" sigA3 = sin.(time3)u"m" -sigA = ([time1, time2, time3], - [sigA1, sigA2, sigA3 ], +sigA = ([time1, time2, time3], + [sigA1, sigA2, sigA3 ], ModiaResult.SignalType) sigB = ([time2], [sin.(time2)], ModiaResult.SignalType) -sigC = ([time3], [sin.(time3)], ModiaResult.Clocked) - -result = ModiaResult.ResultDict("time" => t, +sigC = ([time3], [sin.(time3)], ModiaResult.Clocked) + +result = ModiaResult.ResultDict("time" => t, "sigA" => sigA, "sigB" => sigB, "sigC" => sigC, @@ -276,8 +276,8 @@ struct ResultDict <: AbstractDict{String,Tuple{Any,Any,SignalType}} dict::OrderedCollections.OrderedDict{String,Tuple{Any,Any,SignalType}} defaultHeading::String hasOneTimeSignal::Bool - - ResultDict(args...; defaultHeading="", hasOneTimeSignal=true) = + + ResultDict(args...; defaultHeading="", hasOneTimeSignal=true) = new(OrderedCollections.OrderedDict{String,Tuple{Any,Any,SignalType}}(args...), defaultHeading, hasOneTimeSignal) end @@ -286,7 +286,7 @@ end #new(OrderedCollections.OrderedDict{String,Tuple{Vector{AbstractVector}, # Vector{AbstractVector}, # ModiaResult.SignalType}}(args...), - + # Overload AbstractDict methods Base.haskey(result::ResultDict, key) = Base.haskey(result.dict, key) @@ -314,11 +314,11 @@ Base.values(result::ResultDict) = Base.values(result.dict) """ signalLength(signal) - + Return the total number of values of `signal::Vector{AbstractVector}`. If signal[i] is nothing or missing, a length of zero is returned. """ -function signalLength(signal::AbstractVector) +function signalLength(signal::AbstractVector) for s in signal if ismissing(s) || isnothing(s) return 0 @@ -327,11 +327,11 @@ function signalLength(signal::AbstractVector) return sum( length(s) for s in signal ) end - + """ hasSameSegments(signal1, signal2) - + Return true, if the lengths of the segments in `signal1` and in `signal2` are the same. """ function hasSameSegments(signal1::Vector{AbstractVector}, signal2::Vector{AbstractVector}) @@ -344,14 +344,14 @@ function hasSameSegments(signal1::Vector{AbstractVector}, signal2::Vector{Abstra return false end end - + return true end - + """ hasDimensionMismatch(signal, timeSignal, timeSignalName) - + Print a warning message if signalLength(signal) != signalLength(timeSignal) and return true. Otherwise, return false """ @@ -359,14 +359,14 @@ function hasDimensionMismatch(signal, signalName, timeSignal, timeSignalName::Ab if signalLength(signal) != signalLength(timeSignal) lensignal = signalLength(signal) lentime = signalLength(timeSignal) - @warn "signalLength of \"$signalName\" = $lensignal but signalLength of \"$timeSignalName\" = $lentime" + @warn "signalLength of \"$signalName\" = $lensignal but signalLength of \"$timeSignalName\" = $lentime" return true end return false end - + """ (sigType, nTime, sigSize, sigElType, sigUnit) = signalInfo(result, name) @@ -380,21 +380,26 @@ Return information about a signal, given the `name` of the signal in `result`: - `sigElType`: ustrip( eltype(signal[1][1]) ), that is the element type of the signal without unit. -- `sigUnit`: Unit of signal +- `sigUnit`: Unit of signal If `name` is defined, but no signal is available (= nothing, missing or zero length), return `nTime=0` and `nothing` for `sigSize, sigElType, sigUnit`. """ function signalInfo(result, name::AbstractString) (timeSignal, signal, sigType) = rawSignal(result,name) - if ismissing(signal) || isnothing(signal) || signalLength(signal) == 0 || - hasDimensionMismatch(signal, name, timeSignal, timeSignalName(result)) - return (sigType, 0, nothing, nothing, nothing) + if ismissing(signal) || isnothing(signal) || !(typeof(signal) <: AbstractArray) || signalLength(signal) == 0 + hasDimensionMismatch(signal, name, timeSignal, timeSignalName(result)) + return (sigType, 0, nothing, nothing, nothing) end - value = signal[1][1] - valueSize = size(value) - valueUnit = unit(value[1]) + value = signal[1][1] + if value isa Number || value isa AbstractArray + valueSize = size(value) + valueUnit = unit(value[1]) + else + hasDimensionMismatch(signal, name, timeSignal, timeSignalName(result)) + return (sigType, signalLength(timeSignal), nothing, typeof(value), nothing) + end if typeof(value) <: MonteCarloMeasurements.Particles elTypeAsString = string(typeof(ustrip.(value[1]))) @@ -402,10 +407,10 @@ function signalInfo(result, name::AbstractString) valueElType = "MonteCarloMeasurements.Particles{" * elTypeAsString * ",$nparticles}" elseif typeof(value) <: MonteCarloMeasurements.StaticParticles elTypeAsString = string(typeof(ustrip.(value[1]))) - nparticles = length(value) - valueElType = "MonteCarloMeasurements.StaticParticles{" * elTypeAsString * ",$nparticles}" + nparticles = length(value) + valueElType = "MonteCarloMeasurements.StaticParticles{" * elTypeAsString * ",$nparticles}" else - valueElType = typeof( ustrip.(value) ) + valueElType = typeof( ustrip.(value) ) end nTime = signalLength(timeSignal) return (sigType, nTime, valueSize, valueElType, valueUnit) @@ -418,7 +423,7 @@ function getSignalDetails(result, name::AbstractString) if hasSignal(result, name) (timeSig, sig2, sigType) = rawSignal(result, name) timeSigName = timeSignalName(result) - if !( isnothing(sig2) || ismissing(sig2) || signalLength(sig2) == 0 || + if !( isnothing(sig2) || ismissing(sig2) || signalLength(sig2) == 0 || hasDimensionMismatch(sig2, name, timeSig, timeSigName) ) sigPresent = true value = sig2[1][1] @@ -426,13 +431,13 @@ function getSignalDetails(result, name::AbstractString) sig = sig2 arrayName = name arrayIndices = () - nScalarSignals = 1 + nScalarSignals = 1 else - arrayName = name - arrayIndices = Tuple(1:Int(ni) for ni in size(value)) - nScalarSignals = length(value) + arrayName = name + arrayIndices = Tuple(1:Int(ni) for ni in size(value)) + nScalarSignals = length(value) sig = Vector{Matrix{eltype(value)}}(undef, length(sig2)) - for segment = 1:length(sig2) + for segment = 1:length(sig2) sig[segment] = zeros(eltype(value), length(sig2[segment]), nScalarSignals) siga = sig[segment] sig2a = sig2[segment] @@ -442,47 +447,48 @@ function getSignalDetails(result, name::AbstractString) end end end - end + end end - + else # Handle signal arrays, such as a.b.c[3] or a.b.c[2:3, 1:5, 3] - if name[end] == ']' + if name[end] == ']' i = findlast('[', name) if i >= 2 arrayName = name[1:i-1] - indices = name[i+1:end-1] + indices = name[i+1:end-1] if hasSignal(result, arrayName) (timeSig, sig2, sigType) = rawSignal(result, arrayName) timeSigName = timeSignalName(result) - if !( isnothing(sig2) || ismissing(sig2) || signalLength(sig2) == 0 || + if !( isnothing(sig2) || ismissing(sig2) || signalLength(sig2) == 0 || hasDimensionMismatch(sig2, arrayName, timeSig, timeSigName) ) sigPresent = true value = sig2[1][1] - + # Determine indices as tuple - arrayIndices = eval( Meta.parse( "(" * indices * ",)" ) ) - + arrayIndices = eval( Meta.parse( "(" * indices * ",)" ) ) + # Determine number of signals #nScalarSignals = sum( length(indexRange) for indexRange in arrayIndices ) - + # Extract sub-matrix sig = Vector{Any}(undef,length(sig2)) for segment = 1:length(sig2) sig2a = sig2[segment] sig[segment] = [getindex(sig2a[i], arrayIndices...) for i in eachindex(sig2a)] end - + # Determine number of signals - nScalarSignals = length(sig[1][1]) - + nScalarSignals = length(sig[1][1]) + # "flatten" array to matrix + #= eltypeValue = eltype(value) if !(eltypeValue <: Number) @warn "eltype($name) = $eltypeValue and this is not <: Number!" return (nothing, nothing, nothing, nothing, name, (), 0) end - for segment = 1:length(sig2) + for segment = 1:length(sig2) sig[segment] = zeros(eltypeValue, length(sig2[segment]), nScalarSignals) siga = sig[segment] sig2a = sig2[segment] @@ -492,6 +498,7 @@ function getSignalDetails(result, name::AbstractString) end end end + =# end end end @@ -507,9 +514,9 @@ end """ - (signal, timeSignal, timeSignalName, signalType, arrayName, arrayIndices, nScalarSignals) = + (signal, timeSignal, timeSignalName, signalType, arrayName, arrayIndices, nScalarSignals) = getSignalWithWarning(result, name) - + Call getSignal(result,name) and print a warning message if `signal == nothing` """ function getSignalDetailsWithWarning(result,name::AbstractString) @@ -539,9 +546,9 @@ end Given the result data structure `result` and a variable `ysigName::AbstractString` with or without array range indices (for example `ysigName = "a.b.c[2,3:5]"`) and an optional -variable name `xsigName::AbstractString` for the x-axis, return +variable name `xsigName::AbstractString` for the x-axis, return -- `xsig::Vector{T1<:Real}`: The vector of the x-axis signal without a unit. Segments are concatenated +- `xsig::Vector{T1<:Real}`: The vector of the x-axis signal without a unit. Segments are concatenated and separated by NaN. - `xsigLegend::AbstractString`: The legend of the x-axis consisting of the x-axis name @@ -561,17 +568,17 @@ variable name `xsigName::AbstractString` for the x-axis, return - `ysigType::`[`SignalType`](@ref): The signal type of `ysig` (either `ModiaResult.Continuous` or `ModiaResult.Clocked`). - -If `ysigName` is not valid, or no signal values are available, the function returns + +If `ysigName` is not valid, or no signal values are available, the function returns `(nothing, nothing, nothing, nothing, nothing)`, and prints a warning message. -""" +""" function getPlotSignal(result, ysigName::AbstractString; xsigName=nothing) (ysig, xsig, timeSigName, ysigType, ysigArrayName, ysigArrayIndices, nysigScalarSignals) = getSignalDetailsWithWarning(result, ysigName) - + # Check y-axis signal and time signal if isnothing(ysig) || isnothing(xsig) || isnothing(timeSigName) || signalLength(ysig) == 0 - @goto ERROR - end + @goto ERROR + end # Get xSigName or check xSigName if isnothing(xsigName) @@ -582,52 +589,52 @@ function getPlotSignal(result, ysigName::AbstractString; xsigName=nothing) @goto ERROR elseif !hasSameSegments(ysig, xsig) @warn "\"$xsigName\" (= x-axis) and \"$ysigName\" (= y-axis) have not the same time signal vector." - @goto ERROR + @goto ERROR end - end - + end + # Check x-axis signal xsigValue = first(first(xsig)) if length(xsigValue) != 1 @warn "\"$xsigName\" does not characterize a scalar variable as needed for the x-axis." @goto ERROR - elseif !( typeof(xsigValue) <: Number ) - @warn "\"$xsigName\" has no Number type values, but values of type " * string(typeof(xsigValue)) * "." - @goto ERROR + elseif !( typeof(xsigValue) <: Number ) + @warn "\"$xsigName\" has no Number type values, but values of type " * string(typeof(xsigValue)) * "." + @goto ERROR elseif typeof(xsigValue) <: Measurements.Measurement @warn "\"$xsigName\" is a Measurements.Measurement type and this is not (yet) supported for the x-axis." - @goto ERROR + @goto ERROR elseif typeof(xsigValue) <: MonteCarloMeasurements.StaticParticles @warn "\"$xsigName\" is a MonteCarloMeasurements.StaticParticles type and this is not supported for the x-axis." - @goto ERROR + @goto ERROR elseif typeof(xsigValue) <: MonteCarloMeasurements.Particles @warn "\"$xsigName\" is a MonteCarloMeasurements.Particles type and this is not supported for the x-axis." - @goto ERROR - end - + @goto ERROR + end + # Build xsigLegend xsigLegend = appendUnit(xsigName, xsigValue) # Get one segment of the y-axis and check it ysegment1 = first(ysig) if !( typeof(ysegment1) <: AbstractVector || typeof(ysegment1) <: AbstractMatrix ) - @error "Bug in function: typeof of an y-axis segment is neither a vector nor a Matrix, but " * string(typeof(ysegment1)) + @error "Bug in function: typeof of an y-axis segment is neither a vector nor a Matrix, but " * string(typeof(ysegment1)) elseif !(eltype(ysegment1) <: Number) @warn "\"$ysigName\" has no Number values but values of type " * string(eltype(ysegment1)) - @goto ERROR + @goto ERROR end # Build ysigLegend value = ysegment1[1] if ysigArrayIndices == () # ysigName is a scalar variable - ysigLegend = [appendUnit(ysigName, value)] - + ysigLegend = [appendUnit(ysigName, value)] + else # ysigName is an array variable ysigLegend = [ysigArrayName * "[" for i = 1:nysigScalarSignals] i = 1 - ySizeLength = Int[] + ySizeLength = Int[] for j1 in eachindex(ysigArrayIndices) push!(ySizeLength, length(ysigArrayIndices[j1])) i = 1 @@ -642,7 +649,7 @@ function getPlotSignal(result, ysigName::AbstractString; xsigName=nothing) ncum = prod( ySizeLength[1:j1-1] ) for j2 in ysigArrayIndices[j1] for j3 = 1:ncum - ysigLegend[i] *= "," * string(j2) + ysigLegend[i] *= "," * string(j2) i += 1 end end @@ -653,32 +660,35 @@ function getPlotSignal(result, ysigName::AbstractString; xsigName=nothing) ysigLegend[i] *= appendUnit("]", ysegment1[1,i]) end end - + #xsig2 = Vector{Any}(undef, length(xsig)) #ysig2 = Vector{Any}(undef, length(ysig)) #for i = 1:length(xsig) # xsig2[i] = collect(ustrip.(xsig[i])) # ysig2[i] = collect(ustrip.(ysig[i])) #end - - xsig2 = collect(ustrip.(first(xsig))) + + + #xsig2 = collect(ustrip.(first(xsig))) + #ysig2 = collect(ustrip.(first(ysig))) + + xsig2 = collect(first(xsig)) # Gives suddenly error with ustrip.(first(xsig)) - unclear why ysig2 = collect(ustrip.(first(ysig))) if length(xsig) > 1 xNaN = convert(eltype(xsig2), NaN) if ndims(ysig2) == 1 - yNaN = convert(eltype(ysig2), NaN) + yNaN = convert(eltype(ysig2), NaN) else yNaN = fill(convert(eltype(ysig2), NaN), 1, size(ysig2,2)) end - + for i = 2:length(xsig) - xsig2 = vcat(xsig2, xNaN, collect(ustrip.(xsig[i]))) + xsig2 = vcat(xsig2, xNaN, collect((xsig[i]))) ysig2 = vcat(ysig2, yNaN, collect(ustrip.(ysig[i]))) end end - return (xsig2, xsigLegend, ysig2, ysigLegend, ysigType) - + @label ERROR return (nothing, nothing, nothing, nothing, nothing) end @@ -687,7 +697,7 @@ end """ getHeading(result, heading) - + Return `heading` if no empty string. Otherwise, return `defaultHeading(result)`. """ getHeading(result, heading::AbstractString) = heading != "" ? heading : defaultHeading(result) @@ -696,7 +706,7 @@ getHeading(result, heading::AbstractString) = heading != "" ? heading : defaultH """ prepend!(prefix, signalLegend) - + Add `prefix` string in front of every element of the `signalLegend` string-Vector. """ function prepend!(prefix::AbstractString, signalLegend::Vector{AbstractString}) diff --git a/test/include_all.jl b/test/include_all.jl index f5c3717..f1e0210 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") -include("test_52_MonteCarloMeasurementsWithDistributions.jl") +Test.@test_broken include("test_52_MonteCarloMeasurementsWithDistributions.jl") include("test_70_ResultDict.jl") # include("test_71_Tables_Rotational_First.jl") # deactivated, because "using CSV" From f082f603ac799db0ed7a1d60303423c28f685963 Mon Sep 17 00:00:00 2001 From: "Martin.Otter@dlr.de" Date: Fri, 21 Jan 2022 13:24:21 +0100 Subject: [PATCH 02/14] Format of sub-heading corrected --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 47bc300..818dc38 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ 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)). From 1fc7028244232a727dc2292622ac8df4cc0f945a Mon Sep 17 00:00:00 2001 From: "Martin.Otter@dlr.de" Date: Fri, 21 Jan 2022 13:25:13 +0100 Subject: [PATCH 03/14] Wrong link corrected --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 818dc38..89a15d8 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ generate the following plot: ## 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: From cdfa42477db9e197fff7e1d8caecf00eb19c2332 Mon Sep 17 00:00:00 2001 From: "Martin.Otter@dlr.de" Date: Tue, 25 Jan 2022 16:08:39 +0100 Subject: [PATCH 04/14] - Manifest.toml updated - Issue with ustrip fixed - Broken test reactivated --- Manifest.toml | 106 ++++++++++++++++++++++---------------------- Project.toml | 2 +- src/Utilities.jl | 7 +-- src/makie.jl | 2 +- test/include_all.jl | 2 +- 5 files changed, 58 insertions(+), 61 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index 873e992..2ede0e0 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" @@ -35,21 +35,21 @@ version = "0.5.1" [[ChainRulesCore]] deps = ["Compat", "LinearAlgebra", "SparseArrays"] -git-tree-sha1 = "f885e7e7c124f8c92650d61b9477b9ac2ee607dd" +git-tree-sha1 = "54fc4400de6e5c3e27be6047da2ef6ba355511f8" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "1.11.1" +version = "1.11.6" [[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 = "5863b0b10512ed4add2b5ec07e335dc6121065a5" uuid = "31c24e10-a181-5473-b8eb-7969acd0382f" -version = "0.25.31" +version = "0.25.41" [[DocStringExtensions]] deps = ["LibGit2"] @@ -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,9 +188,9 @@ version = "1.0.0" [[JLLWrappers]] deps = ["Preferences"] -git-tree-sha1 = "642a199af8b68253517b80bd3bfd17eb4e84df6e" +git-tree-sha1 = "22df5b96feef82434b07327e2d3c770a9b21e023" uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" -version = "1.3.0" +version = "1.4.0" [[LayoutPointers]] deps = ["ArrayInterface", "LinearAlgebra", "ManualMemory", "SIMDTypes", "Static"] @@ -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 = "e08890d19787ec25029113e88c34ec20cac1c91e" uuid = "276daf66-3868-5448-9aa4-cd146d93841b" -version = "1.8.1" +version = "2.0.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 = "2884859916598f974858ff01df7dfc6c708dd895" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "1.2.13" +version = "1.3.3" [[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 = "6e261bff5c9f2537776165dea3067df9de4440cf" uuid = "3d5dd08c-fd9d-11e8-17fa-ed2836048c2f" -version = "0.21.21" +version = "0.21.23" [[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/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" From 8ea8e8133cb4b5c62232f15189faa6b00381582a Mon Sep 17 00:00:00 2001 From: "Martin.Otter@dlr.de" Date: Wed, 2 Feb 2022 17:39:41 +0100 Subject: [PATCH 05/14] Project.toml/Manifest.toml updated --- Manifest.toml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index 2ede0e0..9484809 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -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,9 +35,9 @@ version = "0.5.1" [[ChainRulesCore]] deps = ["Compat", "LinearAlgebra", "SparseArrays"] -git-tree-sha1 = "54fc4400de6e5c3e27be6047da2ef6ba355511f8" +git-tree-sha1 = "f9982ef575e19b0e5c7a98c6e75ee496c0f73a93" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "1.11.6" +version = "1.12.0" [[ChangesOfVariables]] deps = ["ChainRulesCore", "LinearAlgebra", "Test"] @@ -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 = "5863b0b10512ed4add2b5ec07e335dc6121065a5" +git-tree-sha1 = "2e97190dfd4382499a4ac349e8d316491c9db341" uuid = "31c24e10-a181-5473-b8eb-7969acd0382f" -version = "0.25.41" +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"] @@ -188,15 +188,15 @@ version = "1.0.0" [[JLLWrappers]] deps = ["Preferences"] -git-tree-sha1 = "22df5b96feef82434b07327e2d3c770a9b21e023" +git-tree-sha1 = "abc9885a7ca2052a736a600f7fa66209f96506e1" uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" -version = "1.4.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"] @@ -401,9 +401,9 @@ uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [[SpecialFunctions]] deps = ["ChainRulesCore", "IrrationalConstants", "LogExpFunctions", "OpenLibm_jll", "OpenSpecFun_jll"] -git-tree-sha1 = "e08890d19787ec25029113e88c34ec20cac1c91e" +git-tree-sha1 = "e6bf188613555c78062842777b116905a9f9dd49" uuid = "276daf66-3868-5448-9aa4-cd146d93841b" -version = "2.0.0" +version = "2.1.0" [[Static]] deps = ["IfElse"] @@ -413,9 +413,9 @@ version = "0.4.1" [[StaticArrays]] deps = ["LinearAlgebra", "Random", "Statistics"] -git-tree-sha1 = "2884859916598f974858ff01df7dfc6c708dd895" +git-tree-sha1 = "a635a9333989a094bddc9f940c04c549cd66afcf" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "1.3.3" +version = "1.3.4" [[Statistics]] deps = ["LinearAlgebra", "SparseArrays"] @@ -481,9 +481,9 @@ version = "1.10.1" [[VectorizationBase]] deps = ["ArrayInterface", "CPUSummary", "HostCPUFeatures", "Hwloc", "IfElse", "LayoutPointers", "Libdl", "LinearAlgebra", "SIMDTypes", "Static"] -git-tree-sha1 = "6e261bff5c9f2537776165dea3067df9de4440cf" +git-tree-sha1 = "e9a35d501b24c127af57ca5228bcfb806eda7507" uuid = "3d5dd08c-fd9d-11e8-17fa-ed2836048c2f" -version = "0.21.23" +version = "0.21.24" [[Zlib_jll]] deps = ["Libdl"] From e402d1b8ab9e28d2f2479aa0e9636e82ffa21598 Mon Sep 17 00:00:00 2001 From: "Martin.Otter@dlr.de" Date: Wed, 2 Feb 2022 17:43:55 +0100 Subject: [PATCH 06/14] Release notes added --- docs/src/index.md | 9 +++++++++ 1 file changed, 9 insertions(+) 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`. From 40db82e13474e12ed2189a804b43ccb74520eddd Mon Sep 17 00:00:00 2001 From: "Martin.Otter@dlr.de" Date: Wed, 2 Feb 2022 23:40:03 +0100 Subject: [PATCH 07/14] Packages used in test models, prefixed with `ModiaResult.` to avoid missing package errors. --- Project.toml | 2 +- docs/src/index.md | 4 ++++ test/test_01_OneScalarSignal.jl | 2 +- test/test_02_OneScalarSignalWithUnit.jl | 4 ++-- test/test_03_OneVectorSignalWithUnit.jl | 4 ++-- test/test_04_ConstantSignalsWithUnit.jl | 4 ++-- test/test_05_ArraySignalsWithUnit.jl | 4 ++-- test/test_06_OneScalarMeasurementSignal.jl | 6 +++--- test/test_07_OneScalarMeasurementSignalWithUnit.jl | 6 +++--- test/test_20_SeveralSignalsInOneDiagram.jl | 4 ++-- test/test_21_VectorOfPlots.jl | 4 ++-- test/test_22_MatrixOfPlots.jl | 4 ++-- test/test_23_MatrixOfPlotsWithTimeLabelsInLastRow.jl | 4 ++-- test/test_24_Reuse.jl | 4 ++-- test/test_25_SeveralFigures.jl | 4 ++-- test/test_26_TooManyLegends.jl | 4 ++-- test/test_51_OneScalarMonteCarloMeasurementsSignal.jl | 6 +++--- test/test_52_MonteCarloMeasurementsWithDistributions.jl | 8 ++++---- test/test_70_ResultDict.jl | 2 +- test/test_72_ResultDictWithMatrixOfPlots.jl | 2 +- test/test_72_ResultDictWithMatrixOfPlotsb.jl | 2 +- test/test_80_Warnings.jl | 4 ++-- test/test_90_CompareOneScalarSignal.jl | 4 ++-- test/test_91_CompareOneScalarSignalWithUnit.jl | 4 ++-- 24 files changed, 50 insertions(+), 46 deletions(-) diff --git a/Project.toml b/Project.toml index 01523ef..223f96c 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.9" +version = "0.3.10" [deps] DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" diff --git a/docs/src/index.md b/docs/src/index.md index 2a4f5cc..bb04732 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -138,6 +138,10 @@ are different to the Python 2.x version. ## Release Notes +### Version 0.3.10 + +- Packages used in test models, prefixed with `ModiaResult.` to avoid missing package errors. + ### Version 0.3.9 diff --git a/test/test_01_OneScalarSignal.jl b/test/test_01_OneScalarSignal.jl index 1f43a29..8aaa45d 100644 --- a/test/test_01_OneScalarSignal.jl +++ b/test/test_01_OneScalarSignal.jl @@ -1,7 +1,7 @@ module test_01_OneScalarSignal using ModiaResult -using OrderedCollections +using ModiaResult.OrderedCollections ModiaResult.@usingModiaPlot t = range(0.0, stop=10.0, length=100) diff --git a/test/test_02_OneScalarSignalWithUnit.jl b/test/test_02_OneScalarSignalWithUnit.jl index 4f0cf32..39c5832 100644 --- a/test/test_02_OneScalarSignalWithUnit.jl +++ b/test/test_02_OneScalarSignalWithUnit.jl @@ -1,8 +1,8 @@ module test_02_OneScalarSignalWithUnit using ModiaResult -using Unitful -using OrderedCollections +using ModiaResult.Unitful +using ModiaResult.OrderedCollections ModiaResult.@usingModiaPlot t = range(0.0, stop=10.0, length=100) diff --git a/test/test_03_OneVectorSignalWithUnit.jl b/test/test_03_OneVectorSignalWithUnit.jl index 8239c43..6160156 100644 --- a/test/test_03_OneVectorSignalWithUnit.jl +++ b/test/test_03_OneVectorSignalWithUnit.jl @@ -1,8 +1,8 @@ module test_03_OneVectorSignalWithUnit using ModiaResult -using Unitful -using OrderedCollections +using ModiaResult.Unitful +using ModiaResult.OrderedCollections ModiaResult.@usingModiaPlot t = range(0.0, stop=10.0, length=100) diff --git a/test/test_04_ConstantSignalsWithUnit.jl b/test/test_04_ConstantSignalsWithUnit.jl index 4553b31..10c2d2d 100644 --- a/test/test_04_ConstantSignalsWithUnit.jl +++ b/test/test_04_ConstantSignalsWithUnit.jl @@ -1,8 +1,8 @@ module test_04_ConstantSignalsWithUnit using ModiaResult -using Unitful -using OrderedCollections +using ModiaResult.Unitful +using ModiaResult.OrderedCollections ModiaResult.@usingModiaPlot inertia = [1.1 1.2 1.3; diff --git a/test/test_05_ArraySignalsWithUnit.jl b/test/test_05_ArraySignalsWithUnit.jl index 3d1b9b2..d31ff5d 100644 --- a/test/test_05_ArraySignalsWithUnit.jl +++ b/test/test_05_ArraySignalsWithUnit.jl @@ -1,8 +1,8 @@ module test_05_ArraySignalsWithUnit using ModiaResult -using Unitful -using OrderedCollections +using ModiaResult.Unitful +using ModiaResult.OrderedCollections ModiaResult.@usingModiaPlot t = range(0.0, stop=1.0, length=100) diff --git a/test/test_06_OneScalarMeasurementSignal.jl b/test/test_06_OneScalarMeasurementSignal.jl index e2e8f7b..9fc3b07 100644 --- a/test/test_06_OneScalarMeasurementSignal.jl +++ b/test/test_06_OneScalarMeasurementSignal.jl @@ -1,9 +1,9 @@ module test_06_OneScalarMeasurementSignal using ModiaResult -using OrderedCollections -using Unitful -using Measurements +using ModiaResult.OrderedCollections +using ModiaResult.Unitful +using ModiaResult.Measurements ModiaResult.@usingModiaPlot t = range(0.0, stop=10.0, length=100) diff --git a/test/test_07_OneScalarMeasurementSignalWithUnit.jl b/test/test_07_OneScalarMeasurementSignalWithUnit.jl index 713ca4b..b305300 100644 --- a/test/test_07_OneScalarMeasurementSignalWithUnit.jl +++ b/test/test_07_OneScalarMeasurementSignalWithUnit.jl @@ -1,9 +1,9 @@ module test_07_OneScalarMeasurementSignalWithUnit using ModiaResult -using OrderedCollections -using Unitful -using Measurements +using ModiaResult.OrderedCollections +using ModiaResult.Unitful +using ModiaResult.Measurements ModiaResult.@usingModiaPlot t = range(0.0, stop=10.0, length=100) diff --git a/test/test_20_SeveralSignalsInOneDiagram.jl b/test/test_20_SeveralSignalsInOneDiagram.jl index a92a175..14fa454 100644 --- a/test/test_20_SeveralSignalsInOneDiagram.jl +++ b/test/test_20_SeveralSignalsInOneDiagram.jl @@ -1,8 +1,8 @@ module test_20_SeveralSignalsInOneDiagram using ModiaResult -using Unitful -using OrderedCollections +using ModiaResult.Unitful +using ModiaResult.OrderedCollections ModiaResult.@usingModiaPlot t = range(0.0, stop=10.0, length=100) diff --git a/test/test_21_VectorOfPlots.jl b/test/test_21_VectorOfPlots.jl index 8567bbe..e5bc3f7 100644 --- a/test/test_21_VectorOfPlots.jl +++ b/test/test_21_VectorOfPlots.jl @@ -1,8 +1,8 @@ module test_21_VectorOfPlots using ModiaResult -using Unitful -using OrderedCollections +using ModiaResult.Unitful +using ModiaResult.OrderedCollections ModiaResult.@usingModiaPlot t = range(0.0, stop=10.0, length=100) diff --git a/test/test_22_MatrixOfPlots.jl b/test/test_22_MatrixOfPlots.jl index 15372ad..79d097e 100644 --- a/test/test_22_MatrixOfPlots.jl +++ b/test/test_22_MatrixOfPlots.jl @@ -1,8 +1,8 @@ module test_22_MatrixOfPlots using ModiaResult -using OrderedCollections -using Unitful +using ModiaResult.OrderedCollections +using ModiaResult.Unitful ModiaResult.@usingModiaPlot t = range(0.0, stop=10.0, length=100) diff --git a/test/test_23_MatrixOfPlotsWithTimeLabelsInLastRow.jl b/test/test_23_MatrixOfPlotsWithTimeLabelsInLastRow.jl index 0b90835..99b8fd8 100644 --- a/test/test_23_MatrixOfPlotsWithTimeLabelsInLastRow.jl +++ b/test/test_23_MatrixOfPlotsWithTimeLabelsInLastRow.jl @@ -1,8 +1,8 @@ module test_23_MatrixOfPlotsWithTimeLabelsInLastRow using ModiaResult -using OrderedCollections -using Unitful +using ModiaResult.OrderedCollections +using ModiaResult.Unitful ModiaResult.@usingModiaPlot t = range(0.0, stop=10.0, length=100) diff --git a/test/test_24_Reuse.jl b/test/test_24_Reuse.jl index 55242f2..83365f7 100644 --- a/test/test_24_Reuse.jl +++ b/test/test_24_Reuse.jl @@ -1,8 +1,8 @@ module test_24_Reuse using ModiaResult -using Unitful -using OrderedCollections +using ModiaResult.Unitful +using ModiaResult.OrderedCollections ModiaResult.@usingModiaPlot t = range(0.0, stop=10.0, length=100) diff --git a/test/test_25_SeveralFigures.jl b/test/test_25_SeveralFigures.jl index e0f51d4..378fd94 100644 --- a/test/test_25_SeveralFigures.jl +++ b/test/test_25_SeveralFigures.jl @@ -1,8 +1,8 @@ module test_25_SeveralFigures using ModiaResult -using OrderedCollections -using Unitful +using ModiaResult.OrderedCollections +using ModiaResult.Unitful ModiaResult.@usingModiaPlot t = range(0.0, stop=10.0, length=100) diff --git a/test/test_26_TooManyLegends.jl b/test/test_26_TooManyLegends.jl index 70f6e8d..02d9b4e 100644 --- a/test/test_26_TooManyLegends.jl +++ b/test/test_26_TooManyLegends.jl @@ -1,8 +1,8 @@ module test_26_TooManyLegends using ModiaResult -using OrderedCollections -using Unitful +using ModiaResult.OrderedCollections +using ModiaResult.Unitful ModiaResult.@usingModiaPlot t = range(0.0, stop=10.0, length=100) diff --git a/test/test_51_OneScalarMonteCarloMeasurementsSignal.jl b/test/test_51_OneScalarMonteCarloMeasurementsSignal.jl index 24d27dc..b4c3970 100644 --- a/test/test_51_OneScalarMonteCarloMeasurementsSignal.jl +++ b/test/test_51_OneScalarMonteCarloMeasurementsSignal.jl @@ -1,9 +1,9 @@ module test_51_OneScalarMonteCarloMeasurementsSignal using ModiaResult -using OrderedCollections -using Unitful -using MonteCarloMeasurements +using ModiaResult.OrderedCollections +using ModiaResult.Unitful +using ModiaResult.MonteCarloMeasurements ModiaResult.@usingModiaPlot t = range(0.0, stop=10.0, length=100) diff --git a/test/test_52_MonteCarloMeasurementsWithDistributions.jl b/test/test_52_MonteCarloMeasurementsWithDistributions.jl index 3256c91..c0e1944 100644 --- a/test/test_52_MonteCarloMeasurementsWithDistributions.jl +++ b/test/test_52_MonteCarloMeasurementsWithDistributions.jl @@ -1,10 +1,10 @@ module test_52_MonteCarloMeasurementsWithDistributions using ModiaResult -using OrderedCollections -using Unitful -using MonteCarloMeasurements -using Distributions +using ModiaResult.OrderedCollections +using ModiaResult.Unitful +using ModiaResult.MonteCarloMeasurements +using ModiaResult.MonteCarloMeasurements.Distributions ModiaResult.@usingModiaPlot t = range(0.0, stop=10.0, length=100) diff --git a/test/test_70_ResultDict.jl b/test/test_70_ResultDict.jl index 92d0009..f256030 100644 --- a/test/test_70_ResultDict.jl +++ b/test/test_70_ResultDict.jl @@ -1,7 +1,7 @@ module test_0_ResultDict using ModiaResult -using Unitful +using ModiaResult.Unitful ModiaResult.@usingModiaPlot time0 = [0.0, 15.0] diff --git a/test/test_72_ResultDictWithMatrixOfPlots.jl b/test/test_72_ResultDictWithMatrixOfPlots.jl index 55e6b04..1fa1d72 100644 --- a/test/test_72_ResultDictWithMatrixOfPlots.jl +++ b/test/test_72_ResultDictWithMatrixOfPlots.jl @@ -1,7 +1,7 @@ module test_72_ResultDictWithMatrixOfPlots using ModiaResult -using Unitful +using ModiaResult.Unitful ModiaResult.@usingModiaPlot tr = [0.0, 15.0] diff --git a/test/test_72_ResultDictWithMatrixOfPlotsb.jl b/test/test_72_ResultDictWithMatrixOfPlotsb.jl index d6e1f5d..dca5f34 100644 --- a/test/test_72_ResultDictWithMatrixOfPlotsb.jl +++ b/test/test_72_ResultDictWithMatrixOfPlotsb.jl @@ -1,7 +1,7 @@ module test_72_ResultDictWithMatrixOfPlotsb using ModiaResult -using Unitful +using ModiaResult.Unitful ModiaResult.@usingModiaPlot tr = [0.0, 15.0] diff --git a/test/test_80_Warnings.jl b/test/test_80_Warnings.jl index 5dd4b31..71541a5 100644 --- a/test/test_80_Warnings.jl +++ b/test/test_80_Warnings.jl @@ -1,8 +1,8 @@ module test_80_Warnings using ModiaResult -using OrderedCollections -using Unitful +using ModiaResult.OrderedCollections +using ModiaResult.Unitful ModiaResult.@usingModiaPlot t = range(0.0, stop=10.0, length=100) diff --git a/test/test_90_CompareOneScalarSignal.jl b/test/test_90_CompareOneScalarSignal.jl index 757a3f6..1706630 100644 --- a/test/test_90_CompareOneScalarSignal.jl +++ b/test/test_90_CompareOneScalarSignal.jl @@ -1,8 +1,8 @@ module test_90_CompareOneScalarSignal using ModiaResult -using OrderedCollections -using DataFrames +using ModiaResult.OrderedCollections +using ModiaResult.DataFrames ModiaResult.@usingModiaPlotPackage t1 = range(0.0, stop=10.0, length=100) diff --git a/test/test_91_CompareOneScalarSignalWithUnit.jl b/test/test_91_CompareOneScalarSignalWithUnit.jl index 01f5644..97a7382 100644 --- a/test/test_91_CompareOneScalarSignalWithUnit.jl +++ b/test/test_91_CompareOneScalarSignalWithUnit.jl @@ -1,8 +1,8 @@ module test_91_CompareOneScalarSignalWithUnit using ModiaResult -using Unitful -using DataFrames +using ModiaResult.Unitful +using ModiaResult.DataFrames ModiaResult.@usingModiaPlotPackage t = range(0.0, stop=10.0, length=100) From cbf48ec5ba836dfec82f85e32d7cea50828493b0 Mon Sep 17 00:00:00 2001 From: "Martin.Otter@dlr.de" Date: Thu, 3 Feb 2022 12:28:00 +0100 Subject: [PATCH 08/14] Require Julia 1.7; upgrade Manifest.toml to version 2.0; update Project.toml/Manifest.toml --- Manifest.toml | 217 ++++++++++++++++++++++++++------------------------ Project.toml | 4 +- 2 files changed, 116 insertions(+), 105 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index 9484809..56e0d00 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -1,498 +1,509 @@ # This file is machine-generated - editing it directly is not advised -[[ArgTools]] +julia_version = "1.7.1" +manifest_format = "2.0" + +[[deps.ArgTools]] uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f" -[[ArrayInterface]] +[[deps.ArrayInterface]] deps = ["Compat", "IfElse", "LinearAlgebra", "Requires", "SparseArrays", "Static"] git-tree-sha1 = "1ee88c4c76caa995a885dc2f22a5d548dfbbc0ba" uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9" version = "3.2.2" -[[Artifacts]] +[[deps.Artifacts]] uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" -[[Base64]] +[[deps.Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" -[[BitTwiddlingConvenienceFunctions]] +[[deps.BitTwiddlingConvenienceFunctions]] deps = ["Static"] git-tree-sha1 = "5e98d6a6aa92e5758c4d58501b7bf23732699fa3" uuid = "62783981-4cbd-42fc-bca8-16325de8dc4b" version = "0.1.2" -[[CPUSummary]] +[[deps.CPUSummary]] deps = ["Hwloc", "IfElse", "Static"] git-tree-sha1 = "ba19d1c8ff6b9c680015033c66802dd817a9cf39" uuid = "2a0fbf3d-bb9c-48f3-b0a9-814d99fd7ab9" version = "0.1.7" -[[Calculus]] +[[deps.Calculus]] deps = ["LinearAlgebra"] git-tree-sha1 = "f641eb0a4f00c343bbc32346e1217b86f3ce9dad" uuid = "49dc2e85-a5d0-5ad3-a950-438e2897f1b9" version = "0.5.1" -[[ChainRulesCore]] +[[deps.ChainRulesCore]] deps = ["Compat", "LinearAlgebra", "SparseArrays"] git-tree-sha1 = "f9982ef575e19b0e5c7a98c6e75ee496c0f73a93" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" version = "1.12.0" -[[ChangesOfVariables]] +[[deps.ChangesOfVariables]] deps = ["ChainRulesCore", "LinearAlgebra", "Test"] git-tree-sha1 = "bf98fa45a0a4cee295de98d4c1462be26345b9a1" uuid = "9e997f8a-9a97-42d5-a9f1-ce6bfc15e2c0" version = "0.1.2" -[[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 = "44c37b4636bc54afac5c574d2d02b625349d6582" uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" version = "3.41.0" -[[CompilerSupportLibraries_jll]] +[[deps.CompilerSupportLibraries_jll]] deps = ["Artifacts", "Libdl"] uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" -[[ConstructionBase]] +[[deps.ConstructionBase]] deps = ["LinearAlgebra"] git-tree-sha1 = "f74e9d5388b8620b4cee35d4c5a618dd4dc547f4" uuid = "187b0558-2788-49d3-abe0-74a17ed4e7c9" version = "1.3.0" -[[Crayons]] +[[deps.Crayons]] git-tree-sha1 = "249fe38abf76d48563e2f4556bebd215aa317e15" uuid = "a8cc5b0e-0ffa-5ad4-8c14-923d3ee1735f" version = "4.1.1" -[[DataAPI]] +[[deps.DataAPI]] git-tree-sha1 = "cc70b17275652eb47bc9e5f81635981f13cea5c8" uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a" version = "1.9.0" -[[DataFrames]] +[[deps.DataFrames]] deps = ["Compat", "DataAPI", "Future", "InvertedIndices", "IteratorInterfaceExtensions", "LinearAlgebra", "Markdown", "Missings", "PooledArrays", "PrettyTables", "Printf", "REPL", "Reexport", "SortingAlgorithms", "Statistics", "TableTraits", "Tables", "Unicode"] git-tree-sha1 = "ae02104e835f219b8930c7664b8012c93475c340" uuid = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" version = "1.3.2" -[[DataStructures]] +[[deps.DataStructures]] deps = ["Compat", "InteractiveUtils", "OrderedCollections"] git-tree-sha1 = "3daef5523dd2e769dad2365274f760ff5f282c7d" uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" version = "0.18.11" -[[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" -[[DensityInterface]] +[[deps.DensityInterface]] deps = ["InverseFunctions", "Test"] git-tree-sha1 = "80c3e8639e3353e5d2912fb3a1916b8455e2494b" uuid = "b429d917-457f-4dbc-8f4c-0cc954292b1d" version = "0.4.0" -[[Distributed]] +[[deps.Distributed]] deps = ["Random", "Serialization", "Sockets"] uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" -[[Distributions]] +[[deps.Distributions]] deps = ["ChainRulesCore", "DensityInterface", "FillArrays", "LinearAlgebra", "PDMats", "Printf", "QuadGK", "Random", "SparseArrays", "SpecialFunctions", "Statistics", "StatsBase", "StatsFuns", "Test"] git-tree-sha1 = "2e97190dfd4382499a4ac349e8d316491c9db341" uuid = "31c24e10-a181-5473-b8eb-7969acd0382f" version = "0.25.46" -[[DocStringExtensions]] +[[deps.DocStringExtensions]] deps = ["LibGit2"] git-tree-sha1 = "b19534d1895d702889b219c382a6e18010797f0b" uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" version = "0.8.6" -[[Downloads]] +[[deps.Downloads]] deps = ["ArgTools", "LibCURL", "NetworkOptions"] uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6" -[[FillArrays]] +[[deps.FillArrays]] deps = ["LinearAlgebra", "Random", "SparseArrays", "Statistics"] git-tree-sha1 = "8756f9935b7ccc9064c6eef0bff0ad643df733a3" uuid = "1a297f60-69ca-5386-bcde-b61e274b549b" version = "0.12.7" -[[Formatting]] +[[deps.Formatting]] deps = ["Printf"] git-tree-sha1 = "8339d61043228fdd3eb658d86c926cb282ae72a8" uuid = "59287772-0a20-5a39-b81b-1366585eb4c0" version = "0.4.2" -[[Future]] +[[deps.Future]] deps = ["Random"] uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" -[[HostCPUFeatures]] +[[deps.HostCPUFeatures]] deps = ["BitTwiddlingConvenienceFunctions", "IfElse", "Libdl", "Static"] git-tree-sha1 = "3965a3216446a6b020f0d48f1ba94ef9ec01720d" uuid = "3e5b6fbb-0976-4d2c-9146-d79de83f2fb0" version = "0.1.6" -[[Hwloc]] +[[deps.Hwloc]] deps = ["Hwloc_jll"] git-tree-sha1 = "92d99146066c5c6888d5a3abc871e6a214388b91" uuid = "0e44f5e4-bd66-52a0-8798-143a42290a1d" version = "2.0.0" -[[Hwloc_jll]] +[[deps.Hwloc_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "d8bccde6fc8300703673ef9e1383b11403ac1313" uuid = "e33a78d0-f292-5ffc-b300-72abe9b543c8" version = "2.7.0+0" -[[IfElse]] +[[deps.IfElse]] git-tree-sha1 = "debdd00ffef04665ccbb3e150747a77560e8fad1" uuid = "615f187c-cbe4-4ef1-ba3b-2fcf58d6d173" version = "0.1.1" -[[InteractiveUtils]] +[[deps.InteractiveUtils]] deps = ["Markdown"] uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" -[[InverseFunctions]] +[[deps.InverseFunctions]] deps = ["Test"] git-tree-sha1 = "a7254c0acd8e62f1ac75ad24d5db43f5f19f3c65" uuid = "3587e190-3f89-42d0-90ee-14403ec27112" version = "0.1.2" -[[InvertedIndices]] +[[deps.InvertedIndices]] git-tree-sha1 = "bee5f1ef5bf65df56bdd2e40447590b272a5471f" uuid = "41ab1584-1d38-5bbf-9106-f11c6c58b48f" version = "1.1.0" -[[IrrationalConstants]] +[[deps.IrrationalConstants]] git-tree-sha1 = "7fd44fd4ff43fc60815f8e764c0f352b83c49151" uuid = "92d709cd-6900-40b7-9082-c6be49f344b6" version = "0.1.1" -[[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 = "abc9885a7ca2052a736a600f7fa66209f96506e1" uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" version = "1.4.1" -[[LayoutPointers]] +[[deps.LayoutPointers]] deps = ["ArrayInterface", "LinearAlgebra", "ManualMemory", "SIMDTypes", "Static"] git-tree-sha1 = "6dd77ee76188b0365f7d882d674b95796076fa2c" uuid = "10f19ff3-798f-405d-979b-55457f8fc047" version = "0.1.5" -[[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.Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" -[[LinearAlgebra]] -deps = ["Libdl"] +[[deps.LinearAlgebra]] +deps = ["Libdl", "libblastrampoline_jll"] uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" -[[LogExpFunctions]] +[[deps.LogExpFunctions]] deps = ["ChainRulesCore", "ChangesOfVariables", "DocStringExtensions", "InverseFunctions", "IrrationalConstants", "LinearAlgebra"] git-tree-sha1 = "e5718a00af0ab9756305a0392832c8952c7426c1" uuid = "2ab3a3ac-af41-5b50-aa03-7779005ae688" version = "0.3.6" -[[Logging]] +[[deps.Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" -[[MacroTools]] +[[deps.MacroTools]] deps = ["Markdown", "Random"] git-tree-sha1 = "3d3e902b31198a27340d0bf00d6ac452866021cf" uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" version = "0.5.9" -[[ManualMemory]] +[[deps.ManualMemory]] git-tree-sha1 = "9cb207b18148b2199db259adfa923b45593fe08e" uuid = "d125e4d3-2237-4719-b19c-fa641b8a4667" version = "0.1.6" -[[Markdown]] +[[deps.Markdown]] deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" -[[MbedTLS_jll]] +[[deps.MbedTLS_jll]] deps = ["Artifacts", "Libdl"] uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" -[[Measurements]] +[[deps.Measurements]] deps = ["Calculus", "LinearAlgebra", "Printf", "RecipesBase", "Requires"] git-tree-sha1 = "58390f5617544fb09d27244749484fee0cae6712" uuid = "eff96d63-e80a-5855-80a2-b1b0885c5ab7" version = "2.7.0" -[[Missings]] +[[deps.Missings]] deps = ["DataAPI"] git-tree-sha1 = "bf210ce90b6c9eed32d25dbcae1ebc565df2687f" uuid = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28" version = "1.0.2" -[[Mmap]] +[[deps.Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" -[[MonteCarloMeasurements]] +[[deps.MonteCarloMeasurements]] deps = ["Distributed", "Distributions", "LinearAlgebra", "MacroTools", "Random", "RecipesBase", "Requires", "SLEEFPirates", "StaticArrays", "Statistics", "StatsBase", "Test"] git-tree-sha1 = "a438746036111a49ba2cb435681aeef0f1d8e9bc" uuid = "0987c9cc-fe09-11e8-30f0-b96dd679fdca" version = "1.0.6" -[[MozillaCACerts_jll]] +[[deps.MozillaCACerts_jll]] uuid = "14a3606d-f60d-562e-9121-12d972cd8159" -[[NetworkOptions]] +[[deps.NetworkOptions]] uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" -[[OpenLibm_jll]] +[[deps.OpenBLAS_jll]] +deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"] +uuid = "4536629a-c528-5b80-bd46-f80d51c5b363" + +[[deps.OpenLibm_jll]] deps = ["Artifacts", "Libdl"] uuid = "05823500-19ac-5b8b-9628-191a04bc5112" -[[OpenSpecFun_jll]] +[[deps.OpenSpecFun_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "13652491f6856acfd2db29360e1bbcd4565d04f1" uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e" version = "0.5.5+0" -[[OrderedCollections]] +[[deps.OrderedCollections]] git-tree-sha1 = "85f8e6578bf1f9ee0d11e7bb1b1456435479d47c" uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" version = "1.4.1" -[[PDMats]] +[[deps.PDMats]] deps = ["LinearAlgebra", "SparseArrays", "SuiteSparse"] git-tree-sha1 = "ee26b350276c51697c9c2d88a072b339f9f03d73" uuid = "90014a1f-27ba-587c-ab20-58faa44d9150" version = "0.11.5" -[[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" -[[PooledArrays]] +[[deps.PooledArrays]] deps = ["DataAPI", "Future"] git-tree-sha1 = "db3a23166af8aebf4db5ef87ac5b00d36eb771e2" uuid = "2dfb63ee-cc39-5dd5-95bd-886bf059d720" version = "1.4.0" -[[Preferences]] +[[deps.Preferences]] deps = ["TOML"] git-tree-sha1 = "2cf929d64681236a2e074ffafb8d568733d2e6af" uuid = "21216c6a-2e73-6563-6e65-726566657250" version = "1.2.3" -[[PrettyTables]] +[[deps.PrettyTables]] deps = ["Crayons", "Formatting", "Markdown", "Reexport", "Tables"] git-tree-sha1 = "dfb54c4e414caa595a1f2ed759b160f5a3ddcba5" uuid = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d" version = "1.3.1" -[[Printf]] +[[deps.Printf]] deps = ["Unicode"] uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" -[[QuadGK]] +[[deps.QuadGK]] deps = ["DataStructures", "LinearAlgebra"] git-tree-sha1 = "78aadffb3efd2155af139781b8a8df1ef279ea39" uuid = "1fd47b50-473d-5c70-9696-f719f8f3bcdc" version = "2.4.2" -[[REPL]] +[[deps.REPL]] deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"] uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" -[[Random]] -deps = ["Serialization"] +[[deps.Random]] +deps = ["SHA", "Serialization"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" -[[RecipesBase]] +[[deps.RecipesBase]] git-tree-sha1 = "6bf3f380ff52ce0832ddd3a2a7b9538ed1bcca7d" uuid = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" version = "1.2.1" -[[Reexport]] +[[deps.Reexport]] git-tree-sha1 = "45e428421666073eab6f2da5c9d310d99bb12f9b" uuid = "189a3867-3050-52da-a836-e630ba90ab69" version = "1.2.2" -[[Requires]] +[[deps.Requires]] deps = ["UUIDs"] git-tree-sha1 = "838a3a4188e2ded87a4f9f184b4b0d78a1e91cb7" uuid = "ae029012-a4dd-5104-9daa-d747884805df" version = "1.3.0" -[[Rmath]] +[[deps.Rmath]] deps = ["Random", "Rmath_jll"] git-tree-sha1 = "bf3188feca147ce108c76ad82c2792c57abe7b1f" uuid = "79098fc4-a85e-5d69-aa6a-4863f24498fa" version = "0.7.0" -[[Rmath_jll]] +[[deps.Rmath_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "68db32dff12bb6127bac73c209881191bf0efbb7" uuid = "f50d1b31-88e8-58de-be2c-1cc44531875f" version = "0.3.0+0" -[[SHA]] +[[deps.SHA]] uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" -[[SIMDTypes]] +[[deps.SIMDTypes]] git-tree-sha1 = "330289636fb8107c5f32088d2741e9fd7a061a5c" uuid = "94e857df-77ce-4151-89e5-788b33177be4" version = "0.1.0" -[[SLEEFPirates]] +[[deps.SLEEFPirates]] deps = ["IfElse", "Static", "VectorizationBase"] git-tree-sha1 = "1410aad1c6b35862573c01b96cd1f6dbe3979994" uuid = "476501e8-09a2-5ece-8869-fb82de89a1fa" version = "0.6.28" -[[Serialization]] +[[deps.Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" -[[SharedArrays]] +[[deps.SharedArrays]] deps = ["Distributed", "Mmap", "Random", "Serialization"] uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383" -[[Sockets]] +[[deps.Sockets]] uuid = "6462fe0b-24de-5631-8697-dd941f90decc" -[[SortingAlgorithms]] +[[deps.SortingAlgorithms]] deps = ["DataStructures"] git-tree-sha1 = "b3363d7460f7d098ca0912c69b082f75625d7508" uuid = "a2af1166-a08f-5f64-846c-94a0d3cef48c" version = "1.0.1" -[[SparseArrays]] +[[deps.SparseArrays]] deps = ["LinearAlgebra", "Random"] uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" -[[SpecialFunctions]] +[[deps.SpecialFunctions]] deps = ["ChainRulesCore", "IrrationalConstants", "LogExpFunctions", "OpenLibm_jll", "OpenSpecFun_jll"] git-tree-sha1 = "e6bf188613555c78062842777b116905a9f9dd49" uuid = "276daf66-3868-5448-9aa4-cd146d93841b" version = "2.1.0" -[[Static]] +[[deps.Static]] deps = ["IfElse"] git-tree-sha1 = "7f5a513baec6f122401abfc8e9c074fdac54f6c1" uuid = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" version = "0.4.1" -[[StaticArrays]] +[[deps.StaticArrays]] deps = ["LinearAlgebra", "Random", "Statistics"] git-tree-sha1 = "a635a9333989a094bddc9f940c04c549cd66afcf" uuid = "90137ffa-7385-5640-81b9-e52037218182" version = "1.3.4" -[[Statistics]] +[[deps.Statistics]] deps = ["LinearAlgebra", "SparseArrays"] uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" -[[StatsAPI]] +[[deps.StatsAPI]] git-tree-sha1 = "d88665adc9bcf45903013af0982e2fd05ae3d0a6" uuid = "82ae8749-77ed-4fe6-ae5f-f523153014b0" version = "1.2.0" -[[StatsBase]] +[[deps.StatsBase]] deps = ["DataAPI", "DataStructures", "LinearAlgebra", "LogExpFunctions", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"] git-tree-sha1 = "51383f2d367eb3b444c961d485c565e4c0cf4ba0" uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" version = "0.33.14" -[[StatsFuns]] +[[deps.StatsFuns]] deps = ["ChainRulesCore", "InverseFunctions", "IrrationalConstants", "LogExpFunctions", "Reexport", "Rmath", "SpecialFunctions"] git-tree-sha1 = "f35e1879a71cca95f4826a14cdbf0b9e253ed918" uuid = "4c63d2b9-4356-54db-8cca-17b64c39e42c" version = "0.9.15" -[[SuiteSparse]] +[[deps.SuiteSparse]] deps = ["Libdl", "LinearAlgebra", "Serialization", "SparseArrays"] uuid = "4607b0f0-06f3-5cda-b6b1-a6196a1729e9" -[[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 = "bb1064c9a84c52e277f1096cf41434b675cd368b" uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" version = "1.6.1" -[[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" -[[UUIDs]] +[[deps.UUIDs]] deps = ["Random", "SHA"] uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" -[[Unicode]] +[[deps.Unicode]] uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" -[[Unitful]] +[[deps.Unitful]] deps = ["ConstructionBase", "Dates", "LinearAlgebra", "Random"] git-tree-sha1 = "b95e0b8a8d1b6a6c3e0b3ca393a7a285af47c264" uuid = "1986cc42-f94f-5a68-af5c-568840ba703d" version = "1.10.1" -[[VectorizationBase]] +[[deps.VectorizationBase]] deps = ["ArrayInterface", "CPUSummary", "HostCPUFeatures", "Hwloc", "IfElse", "LayoutPointers", "Libdl", "LinearAlgebra", "SIMDTypes", "Static"] git-tree-sha1 = "e9a35d501b24c127af57ca5228bcfb806eda7507" uuid = "3d5dd08c-fd9d-11e8-17fa-ed2836048c2f" version = "0.21.24" -[[Zlib_jll]] +[[deps.Zlib_jll]] deps = ["Libdl"] uuid = "83775a58-1f1d-513f-b197-d71354ab007a" -[[nghttp2_jll]] +[[deps.libblastrampoline_jll]] +deps = ["Artifacts", "Libdl", "OpenBLAS_jll"] +uuid = "8e850b90-86db-534c-a0d3-1478176c7d93" + +[[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" diff --git a/Project.toml b/Project.toml index 223f96c..78f01a9 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.10" +version = "0.4.0" [deps] DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" @@ -20,4 +20,4 @@ OrderedCollections = "1" Pkg = "1" Tables = "1" Unitful = "1" -julia = "1" +julia = "1.7" From 7bacc5d564db53b19a693fb74157f5a36ec75b9f Mon Sep 17 00:00:00 2001 From: "Martin.Otter@dlr.de" Date: Thu, 3 Feb 2022 12:30:05 +0100 Subject: [PATCH 09/14] Add release notes --- docs/src/index.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/src/index.md b/docs/src/index.md index bb04732..b590ab8 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -138,6 +138,13 @@ are different to the Python 2.x version. ## Release Notes +### Version 0.4.0 + +- Require Julia 1.7 +- Upgrade Manifest.toml to version 2.0 +- Update Project.toml/Manifest.toml + + ### Version 0.3.10 - Packages used in test models, prefixed with `ModiaResult.` to avoid missing package errors. From 9cb110435a61e3b105e979c5421a23e3b4367573 Mon Sep 17 00:00:00 2001 From: "Martin.Otter@dlr.de" Date: Mon, 21 Feb 2022 14:57:42 +0100 Subject: [PATCH 10/14] Update of Manifest.toml file + increment version number --- Manifest.toml | 82 +++++++++++++++++++++++++++++++-------------------- Project.toml | 2 +- 2 files changed, 51 insertions(+), 33 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index 56e0d00..521492e 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -1,6 +1,6 @@ # This file is machine-generated - editing it directly is not advised -julia_version = "1.7.1" +julia_version = "1.7.2" manifest_format = "2.0" [[deps.ArgTools]] @@ -8,9 +8,9 @@ uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f" [[deps.ArrayInterface]] deps = ["Compat", "IfElse", "LinearAlgebra", "Requires", "SparseArrays", "Static"] -git-tree-sha1 = "1ee88c4c76caa995a885dc2f22a5d548dfbbc0ba" +git-tree-sha1 = "745233d77146ad221629590b6d82fe7f1ddb478f" uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9" -version = "3.2.2" +version = "4.0.3" [[deps.Artifacts]] uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" @@ -26,9 +26,9 @@ version = "0.1.2" [[deps.CPUSummary]] deps = ["Hwloc", "IfElse", "Static"] -git-tree-sha1 = "ba19d1c8ff6b9c680015033c66802dd817a9cf39" +git-tree-sha1 = "849799453de85b55e78550fc7b0c8f442eb497ab" uuid = "2a0fbf3d-bb9c-48f3-b0a9-814d99fd7ab9" -version = "0.1.7" +version = "0.1.8" [[deps.Calculus]] deps = ["LinearAlgebra"] @@ -38,9 +38,9 @@ version = "0.5.1" [[deps.ChainRulesCore]] deps = ["Compat", "LinearAlgebra", "SparseArrays"] -git-tree-sha1 = "f9982ef575e19b0e5c7a98c6e75ee496c0f73a93" +git-tree-sha1 = "7dd38532a1115a215de51775f9891f0f3e1bac6a" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "1.12.0" +version = "1.12.1" [[deps.ChangesOfVariables]] deps = ["ChainRulesCore", "LinearAlgebra", "Test"] @@ -111,9 +111,9 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[deps.Distributions]] deps = ["ChainRulesCore", "DensityInterface", "FillArrays", "LinearAlgebra", "PDMats", "Printf", "QuadGK", "Random", "SparseArrays", "SpecialFunctions", "Statistics", "StatsBase", "StatsFuns", "Test"] -git-tree-sha1 = "2e97190dfd4382499a4ac349e8d316491c9db341" +git-tree-sha1 = "9d3c0c762d4666db9187f363a76b47f7346e673b" uuid = "31c24e10-a181-5473-b8eb-7969acd0382f" -version = "0.25.46" +version = "0.25.49" [[deps.DocStringExtensions]] deps = ["LibGit2"] @@ -125,11 +125,17 @@ version = "0.8.6" deps = ["ArgTools", "LibCURL", "NetworkOptions"] uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6" +[[deps.DualNumbers]] +deps = ["Calculus", "NaNMath", "SpecialFunctions"] +git-tree-sha1 = "84f04fe68a3176a583b864e492578b9466d87f1e" +uuid = "fa6b7ba4-c1ee-5f82-b5fc-ecf0adba8f74" +version = "0.6.6" + [[deps.FillArrays]] deps = ["LinearAlgebra", "Random", "SparseArrays", "Statistics"] -git-tree-sha1 = "8756f9935b7ccc9064c6eef0bff0ad643df733a3" +git-tree-sha1 = "4c7d3757f3ecbcb9055870351078552b7d1dbd2d" uuid = "1a297f60-69ca-5386-bcde-b61e274b549b" -version = "0.12.7" +version = "0.13.0" [[deps.Formatting]] deps = ["Printf"] @@ -159,6 +165,12 @@ git-tree-sha1 = "d8bccde6fc8300703673ef9e1383b11403ac1313" uuid = "e33a78d0-f292-5ffc-b300-72abe9b543c8" version = "2.7.0+0" +[[deps.HypergeometricFunctions]] +deps = ["DualNumbers", "LinearAlgebra", "SpecialFunctions", "Test"] +git-tree-sha1 = "65e4589030ef3c44d3b90bdc5aac462b4bb05567" +uuid = "34004b35-14d8-5ef3-9330-4cdb6864b03a" +version = "0.3.8" + [[deps.IfElse]] git-tree-sha1 = "debdd00ffef04665ccbb3e150747a77560e8fad1" uuid = "615f187c-cbe4-4ef1-ba3b-2fcf58d6d173" @@ -240,9 +252,9 @@ uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" version = "0.5.9" [[deps.ManualMemory]] -git-tree-sha1 = "9cb207b18148b2199db259adfa923b45593fe08e" +git-tree-sha1 = "bcaef4fc7a0cfe2cba636d84cda54b5e4e4ca3cd" uuid = "d125e4d3-2237-4719-b19c-fa641b8a4667" -version = "0.1.6" +version = "0.1.8" [[deps.Markdown]] deps = ["Base64"] @@ -269,13 +281,18 @@ uuid = "a63ad114-7e13-5084-954f-fe012c677804" [[deps.MonteCarloMeasurements]] deps = ["Distributed", "Distributions", "LinearAlgebra", "MacroTools", "Random", "RecipesBase", "Requires", "SLEEFPirates", "StaticArrays", "Statistics", "StatsBase", "Test"] -git-tree-sha1 = "a438746036111a49ba2cb435681aeef0f1d8e9bc" +git-tree-sha1 = "bce0a32d6c64165388eec2573b68000ed06f39c1" uuid = "0987c9cc-fe09-11e8-30f0-b96dd679fdca" -version = "1.0.6" +version = "1.0.7" [[deps.MozillaCACerts_jll]] uuid = "14a3606d-f60d-562e-9121-12d972cd8159" +[[deps.NaNMath]] +git-tree-sha1 = "b086b7ea07f8e38cf122f5016af580881ac914fe" +uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" +version = "0.3.7" + [[deps.NetworkOptions]] uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" @@ -382,9 +399,9 @@ version = "0.1.0" [[deps.SLEEFPirates]] deps = ["IfElse", "Static", "VectorizationBase"] -git-tree-sha1 = "1410aad1c6b35862573c01b96cd1f6dbe3979994" +git-tree-sha1 = "3a5ae1db486e4ce3ccd2b392389943481e20401f" uuid = "476501e8-09a2-5ece-8869-fb82de89a1fa" -version = "0.6.28" +version = "0.6.29" [[deps.Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" @@ -408,42 +425,43 @@ uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [[deps.SpecialFunctions]] deps = ["ChainRulesCore", "IrrationalConstants", "LogExpFunctions", "OpenLibm_jll", "OpenSpecFun_jll"] -git-tree-sha1 = "e6bf188613555c78062842777b116905a9f9dd49" +git-tree-sha1 = "85e5b185ed647b8ee89aa25a7788a2b43aa8a74f" uuid = "276daf66-3868-5448-9aa4-cd146d93841b" -version = "2.1.0" +version = "2.1.3" [[deps.Static]] deps = ["IfElse"] -git-tree-sha1 = "7f5a513baec6f122401abfc8e9c074fdac54f6c1" +git-tree-sha1 = "00b725fffc9a7e9aac8850e4ed75b4c1acbe8cd2" uuid = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" -version = "0.4.1" +version = "0.5.5" [[deps.StaticArrays]] deps = ["LinearAlgebra", "Random", "Statistics"] -git-tree-sha1 = "a635a9333989a094bddc9f940c04c549cd66afcf" +git-tree-sha1 = "95c6a5d0e8c69555842fc4a927fc485040ccc31c" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "1.3.4" +version = "1.3.5" [[deps.Statistics]] deps = ["LinearAlgebra", "SparseArrays"] uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" [[deps.StatsAPI]] -git-tree-sha1 = "d88665adc9bcf45903013af0982e2fd05ae3d0a6" +deps = ["LinearAlgebra"] +git-tree-sha1 = "c3d8ba7f3fa0625b062b82853a7d5229cb728b6b" uuid = "82ae8749-77ed-4fe6-ae5f-f523153014b0" -version = "1.2.0" +version = "1.2.1" [[deps.StatsBase]] deps = ["DataAPI", "DataStructures", "LinearAlgebra", "LogExpFunctions", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"] -git-tree-sha1 = "51383f2d367eb3b444c961d485c565e4c0cf4ba0" +git-tree-sha1 = "8977b17906b0a1cc74ab2e3a05faa16cf08a8291" uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" -version = "0.33.14" +version = "0.33.16" [[deps.StatsFuns]] -deps = ["ChainRulesCore", "InverseFunctions", "IrrationalConstants", "LogExpFunctions", "Reexport", "Rmath", "SpecialFunctions"] -git-tree-sha1 = "f35e1879a71cca95f4826a14cdbf0b9e253ed918" +deps = ["ChainRulesCore", "HypergeometricFunctions", "InverseFunctions", "IrrationalConstants", "LogExpFunctions", "Reexport", "Rmath", "SpecialFunctions"] +git-tree-sha1 = "25405d7016a47cf2bd6cd91e66f4de437fd54a07" uuid = "4c63d2b9-4356-54db-8cca-17b64c39e42c" -version = "0.9.15" +version = "0.9.16" [[deps.SuiteSparse]] deps = ["Libdl", "LinearAlgebra", "Serialization", "SparseArrays"] @@ -482,9 +500,9 @@ uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" [[deps.Unitful]] deps = ["ConstructionBase", "Dates", "LinearAlgebra", "Random"] -git-tree-sha1 = "b95e0b8a8d1b6a6c3e0b3ca393a7a285af47c264" +git-tree-sha1 = "b649200e887a487468b71821e2644382699f1b0f" uuid = "1986cc42-f94f-5a68-af5c-568840ba703d" -version = "1.10.1" +version = "1.11.0" [[deps.VectorizationBase]] deps = ["ArrayInterface", "CPUSummary", "HostCPUFeatures", "Hwloc", "IfElse", "LayoutPointers", "Libdl", "LinearAlgebra", "SIMDTypes", "Static"] diff --git a/Project.toml b/Project.toml index 78f01a9..439e203 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.4.0" +version = "0.4.1" [deps] DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" From b407ed5e9aa19867b8e728319cf296380fbfc67a Mon Sep 17 00:00:00 2001 From: "Martin.Otter@dlr.de" Date: Mon, 2 May 2022 16:58:32 +0200 Subject: [PATCH 11/14] Functions `printResultInfo(..)` and `resultInfo(..)` improved --- Project.toml | 2 +- docs/src/index.md | 12 +++++++ src/ModiaResult.jl | 2 +- src/Utilities.jl | 89 +++++++++++++++++++++++++++++++++++++--------- 4 files changed, 87 insertions(+), 18 deletions(-) diff --git a/Project.toml b/Project.toml index 439e203..fc274b5 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.4.1" +version = "0.4.2" [deps] DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" diff --git a/docs/src/index.md b/docs/src/index.md index b590ab8..22def20 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -138,6 +138,18 @@ are different to the Python 2.x version. ## Release Notes +### Version 0.4.2 + +- `printResultInfo(..)` and `resultInfo(..)` improved + (signals with one value defined with ModiaResult.OneValueVector are specially marked, + for example parameters). + + +### Version 0.4.1 + +- Update of Manifest.toml file + + ### Version 0.4.0 - Require Julia 1.7 diff --git a/src/ModiaResult.jl b/src/ModiaResult.jl index 5af69f9..cf3838e 100644 --- a/src/ModiaResult.jl +++ b/src/ModiaResult.jl @@ -2,12 +2,12 @@ module ModiaResult const path = dirname(dirname(@__FILE__)) +include("ResultViews.jl") include("AbstractInterface.jl") include("NoPlot.jl") include("SilentNoPlot.jl") include("Utilities.jl") include("OverloadedMethods.jl") #include("CompareResults.jl") -include("ResultViews.jl") end # module diff --git a/src/Utilities.jl b/src/Utilities.jl index 9c1b566..4ad6750 100644 --- a/src/Utilities.jl +++ b/src/Utilities.jl @@ -169,29 +169,50 @@ function resultInfo(result) return end - resultInfoTable = DataFrames.DataFrame(name=String[], unit=String[], nTime=String[], signalType=String[], valueSize=String[], eltype=String[]) - + name2 = String[] + unit2 = String[] + nTime2 = String[] + signalType2 = String[] + valueSize2 = String[] + eltype2 = String[] + timeSigName = timeSignalName(result) for name in signalNames(result) - (signalType, nTime, valueSize, elType, sigUnit) = signalInfo(result, name) + (signalType, nTime, valueSize, elType, sigUnit, oneSigValue) = signalInfo2(result, name) if isnothing(elType) - sigUnit2 = "???" - nTime2 = "???" - signalType2 = "???" - valueSize2 = "???" - elType2 = "???" + sigUnit3 = "???" + nTime3 = "???" + signalType3 = "???" + valueSize3 = "???" + eltype3 = "???" else - sigUnit2 = sigUnit isa Nothing ? "???" : string(sigUnit) - nTime2 = name==timeSigName && !hasOneTimeSignal(result) ? "---" : string(nTime) - signalType2 = signalTypeToString[Int(signalType)] - valueSize2 = valueSize isa Nothing ? "()" : string(valueSize) - elType2 = string(elType) + sigUnit3 = sigUnit isa Nothing ? "???" : string(sigUnit) + nTime3 = name==timeSigName && !hasOneTimeSignal(result) ? "---" : (oneSigValue ? string(nTime)*"*" : string(nTime)) + signalType3 = signalTypeToString[Int(signalType)] + valueSize3 = valueSize isa Nothing ? "()" : string(valueSize) + eltype3 = string(elType) end - push!(resultInfoTable, [name, sigUnit2, nTime2, signalType2, valueSize2, elType2] ) + if signalType3 == "Independent" + pushfirst!(name2 , name) + pushfirst!(unit2 , sigUnit3) + pushfirst!(nTime2 , nTime3) + pushfirst!(signalType2, signalType3) + pushfirst!(valueSize2 , valueSize3) + pushfirst!(eltype2 , eltype3) + else + push!(name2 , name) + push!(unit2 , sigUnit3) + push!(nTime2 , nTime3) + push!(signalType2, signalType3) + push!(valueSize2 , valueSize3) + push!(eltype2 , eltype3) + end end + resultInfoTable = DataFrames.DataFrame(name=name2, unit=unit2, nTime=nTime2, signalType=signalType2, valueSize=valueSize2, eltype=eltype2) + return resultInfoTable end @@ -209,7 +230,9 @@ using Unitful ModiaResult.@usingModiaPlot t = range(0.0, stop=10.0, length=100) -result = OrderedDict{String,Any}("time"=> t*u"s", "phi" => sin.(t)*u"rad") +result = OrderedDict{String,Any}("time"=> t*u"s", + "phi" => sin.(t)*u"rad", + "A" => OneValueVector(2.0, length(t))) printResultInfo(result) # Gives output: @@ -217,6 +240,8 @@ printResultInfo(result) ───┼─────────────────────────────────────────────────── 1 │ time s 100 Independent () Float64 2 │ phi rad 100 Continuous () Float64 + 3 | A 100* Continuous () Float64 + *: Signal stored as ModiaResult.OneValueVector (e.g. parameter) ``` """ @@ -224,6 +249,7 @@ function printResultInfo(result)::Nothing resultInfoTable = resultInfo(result) show(stdout, resultInfoTable, summary=false, rowlabel=Symbol("#"), allcols=true, eltypes=false, truncate=50) println(stdout) + println("*: Signal stored as ModiaResult.OneValueVector (e.g. parameter)\n") return nothing end @@ -386,12 +412,43 @@ If `name` is defined, but no signal is available (= nothing, missing or zero len return `nTime=0` and `nothing` for `sigSize, sigElType, sigUnit`. """ function signalInfo(result, name::AbstractString) + (sigType, nTime, valueSize, valueElType, valueUnit, oneSigValue) = signalInfo2(result,name) + return (sigType, nTime, valueSize, valueElType, valueUnit) +end + + +""" + (sigType, nTime, sigSize, sigElType, sigUnit, oneSigValue) = signalInfo2(result, name) + +Return information about a signal, given the `name` of the signal in `result`. +The difference to `signalInfo(..)` is that additionally the information is returned, +whether the signals consists only of one value. + +- `sigType::SignalType`: Ìnterpolation type of signal. + +- `nTime::Int`: Number of signal time points. + +- `sigSize`: size(signal[1][1]) + +- `sigElType`: ustrip( eltype(signal[1][1]) ), that is the element type of the signal without unit. + +- `sigUnit`: Unit of signal + +- `oneSigValue`: = true, at all time instants, the signal has identical values (e.g. if parameter defined with OneValueVector). + = false, signal has potentially different values at different time instants (which might be an array + +If `name` is defined, but no signal is available (= nothing, missing or zero length), +return `nTime=0` and `nothing` for `sigSize, sigElType, sigUnit, oneSigValue`. +""" +function signalInfo2(result, name::AbstractString) (timeSignal, signal, sigType) = rawSignal(result,name) if ismissing(signal) || isnothing(signal) || !(typeof(signal) <: AbstractArray) || signalLength(signal) == 0 hasDimensionMismatch(signal, name, timeSignal, timeSignalName(result)) return (sigType, 0, nothing, nothing, nothing) end + oneSigValue = length(signal) == 1 && typeof(signal[1]) <: OneValueVector + value = signal[1][1] if value isa Number || value isa AbstractArray valueSize = size(value) @@ -413,7 +470,7 @@ function signalInfo(result, name::AbstractString) valueElType = typeof( ustrip.(value) ) end nTime = signalLength(timeSignal) - return (sigType, nTime, valueSize, valueElType, valueUnit) + return (sigType, nTime, valueSize, valueElType, valueUnit, oneSigValue) end From 86d2311bd8689418b286fd22d29235c86fa5531e Mon Sep 17 00:00:00 2001 From: "Martin.Otter@dlr.de" Date: Mon, 2 May 2022 17:09:28 +0200 Subject: [PATCH 12/14] Add a test for improved printResultInfo(..) --- src/Utilities.jl | 2 +- test/test_20_SeveralSignalsInOneDiagram.jl | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Utilities.jl b/src/Utilities.jl index 4ad6750..a1dcd89 100644 --- a/src/Utilities.jl +++ b/src/Utilities.jl @@ -444,7 +444,7 @@ function signalInfo2(result, name::AbstractString) (timeSignal, signal, sigType) = rawSignal(result,name) if ismissing(signal) || isnothing(signal) || !(typeof(signal) <: AbstractArray) || signalLength(signal) == 0 hasDimensionMismatch(signal, name, timeSignal, timeSignalName(result)) - return (sigType, 0, nothing, nothing, nothing) + return (sigType, 0, nothing, nothing, nothing, nothing) end oneSigValue = length(signal) == 1 && typeof(signal[1]) <: OneValueVector diff --git a/test/test_20_SeveralSignalsInOneDiagram.jl b/test/test_20_SeveralSignalsInOneDiagram.jl index 14fa454..0e0b145 100644 --- a/test/test_20_SeveralSignalsInOneDiagram.jl +++ b/test/test_20_SeveralSignalsInOneDiagram.jl @@ -14,10 +14,11 @@ result["phi"] = sin.(t)u"rad" result["phi2"] = 0.5 * sin.(t)u"rad" result["w"] = cos.(t)u"rad/s" result["w2"] = 0.6 * cos.(t)u"rad/s" +result["A"] = ModiaResult.OneValueVector(0.6, length(t)) println("\n... test_20_SeveralSignalsInOneDiagram:") ModiaResult.printResultInfo(result) -plot(result, ("phi", "phi2", "w", "w2"), heading="Several signals in one diagram") +plot(result, ("phi", "phi2", "w", "w2", "A"), heading="Several signals in one diagram") end From 813b06ebdc172b845f94574eaaee8cddaaf4cc70 Mon Sep 17 00:00:00 2001 From: "Martin.Otter@dlr.de" Date: Mon, 2 May 2022 17:29:06 +0200 Subject: [PATCH 13/14] Manifest.toml file updated --- Manifest.toml | 137 +++++++++++++++++++----------------------- docs/src/Functions.md | 2 + 2 files changed, 65 insertions(+), 74 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index 521492e..b8fd5c2 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -8,9 +8,9 @@ uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f" [[deps.ArrayInterface]] deps = ["Compat", "IfElse", "LinearAlgebra", "Requires", "SparseArrays", "Static"] -git-tree-sha1 = "745233d77146ad221629590b6d82fe7f1ddb478f" +git-tree-sha1 = "c933ce606f6535a7c7b98e1d86d5d1014f730596" uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9" -version = "4.0.3" +version = "5.0.7" [[deps.Artifacts]] uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" @@ -20,15 +20,15 @@ uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" [[deps.BitTwiddlingConvenienceFunctions]] deps = ["Static"] -git-tree-sha1 = "5e98d6a6aa92e5758c4d58501b7bf23732699fa3" +git-tree-sha1 = "28bbdbf0354959db89358d1d79d421ff31ef0b5e" uuid = "62783981-4cbd-42fc-bca8-16325de8dc4b" -version = "0.1.2" +version = "0.1.3" [[deps.CPUSummary]] -deps = ["Hwloc", "IfElse", "Static"] -git-tree-sha1 = "849799453de85b55e78550fc7b0c8f442eb497ab" +deps = ["CpuId", "IfElse", "Static"] +git-tree-sha1 = "baaac45b4462b3b0be16726f38b789bf330fcb7a" uuid = "2a0fbf3d-bb9c-48f3-b0a9-814d99fd7ab9" -version = "0.1.8" +version = "0.1.21" [[deps.Calculus]] deps = ["LinearAlgebra"] @@ -38,9 +38,9 @@ version = "0.5.1" [[deps.ChainRulesCore]] deps = ["Compat", "LinearAlgebra", "SparseArrays"] -git-tree-sha1 = "7dd38532a1115a215de51775f9891f0f3e1bac6a" +git-tree-sha1 = "9950387274246d08af38f6eef8cb5480862a435f" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "1.12.1" +version = "1.14.0" [[deps.ChangesOfVariables]] deps = ["ChainRulesCore", "LinearAlgebra", "Test"] @@ -50,9 +50,9 @@ version = "0.1.2" [[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 = "44c37b4636bc54afac5c574d2d02b625349d6582" +git-tree-sha1 = "b153278a25dd42c65abbf4e62344f9d22e59191b" uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "3.41.0" +version = "3.43.0" [[deps.CompilerSupportLibraries_jll]] deps = ["Artifacts", "Libdl"] @@ -64,21 +64,27 @@ git-tree-sha1 = "f74e9d5388b8620b4cee35d4c5a618dd4dc547f4" uuid = "187b0558-2788-49d3-abe0-74a17ed4e7c9" version = "1.3.0" +[[deps.CpuId]] +deps = ["Markdown"] +git-tree-sha1 = "fcbb72b032692610bfbdb15018ac16a36cf2e406" +uuid = "adafc99b-e345-5852-983c-f28acb93d879" +version = "0.3.1" + [[deps.Crayons]] git-tree-sha1 = "249fe38abf76d48563e2f4556bebd215aa317e15" uuid = "a8cc5b0e-0ffa-5ad4-8c14-923d3ee1735f" version = "4.1.1" [[deps.DataAPI]] -git-tree-sha1 = "cc70b17275652eb47bc9e5f81635981f13cea5c8" +git-tree-sha1 = "fb5f5316dd3fd4c5e7c30a24d50643b73e37cd40" uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a" -version = "1.9.0" +version = "1.10.0" [[deps.DataFrames]] deps = ["Compat", "DataAPI", "Future", "InvertedIndices", "IteratorInterfaceExtensions", "LinearAlgebra", "Markdown", "Missings", "PooledArrays", "PrettyTables", "Printf", "REPL", "Reexport", "SortingAlgorithms", "Statistics", "TableTraits", "Tables", "Unicode"] -git-tree-sha1 = "ae02104e835f219b8930c7664b8012c93475c340" +git-tree-sha1 = "6c19003824cbebd804a51211fd3bbd81bf1ecad5" uuid = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" -version = "1.3.2" +version = "1.3.3" [[deps.DataStructures]] deps = ["Compat", "InteractiveUtils", "OrderedCollections"] @@ -111,9 +117,9 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[deps.Distributions]] deps = ["ChainRulesCore", "DensityInterface", "FillArrays", "LinearAlgebra", "PDMats", "Printf", "QuadGK", "Random", "SparseArrays", "SpecialFunctions", "Statistics", "StatsBase", "StatsFuns", "Test"] -git-tree-sha1 = "9d3c0c762d4666db9187f363a76b47f7346e673b" +git-tree-sha1 = "70f5bfdfbdc6c9d2b7a143d70ae88f4cb7b193b1" uuid = "31c24e10-a181-5473-b8eb-7969acd0382f" -version = "0.25.49" +version = "0.25.56" [[deps.DocStringExtensions]] deps = ["LibGit2"] @@ -125,17 +131,11 @@ version = "0.8.6" deps = ["ArgTools", "LibCURL", "NetworkOptions"] uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6" -[[deps.DualNumbers]] -deps = ["Calculus", "NaNMath", "SpecialFunctions"] -git-tree-sha1 = "84f04fe68a3176a583b864e492578b9466d87f1e" -uuid = "fa6b7ba4-c1ee-5f82-b5fc-ecf0adba8f74" -version = "0.6.6" - [[deps.FillArrays]] deps = ["LinearAlgebra", "Random", "SparseArrays", "Statistics"] -git-tree-sha1 = "4c7d3757f3ecbcb9055870351078552b7d1dbd2d" +git-tree-sha1 = "246621d23d1f43e3b9c368bf3b72b2331a27c286" uuid = "1a297f60-69ca-5386-bcde-b61e274b549b" -version = "0.13.0" +version = "0.13.2" [[deps.Formatting]] deps = ["Printf"] @@ -149,9 +149,9 @@ uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" [[deps.HostCPUFeatures]] deps = ["BitTwiddlingConvenienceFunctions", "IfElse", "Libdl", "Static"] -git-tree-sha1 = "3965a3216446a6b020f0d48f1ba94ef9ec01720d" +git-tree-sha1 = "18be5268cf415b5e27f34980ed25a7d34261aa83" uuid = "3e5b6fbb-0976-4d2c-9146-d79de83f2fb0" -version = "0.1.6" +version = "0.1.7" [[deps.Hwloc]] deps = ["Hwloc_jll"] @@ -161,15 +161,9 @@ version = "2.0.0" [[deps.Hwloc_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "d8bccde6fc8300703673ef9e1383b11403ac1313" +git-tree-sha1 = "303d70c961317c4c20fafaf5dbe0e6d610c38542" uuid = "e33a78d0-f292-5ffc-b300-72abe9b543c8" -version = "2.7.0+0" - -[[deps.HypergeometricFunctions]] -deps = ["DualNumbers", "LinearAlgebra", "SpecialFunctions", "Test"] -git-tree-sha1 = "65e4589030ef3c44d3b90bdc5aac462b4bb05567" -uuid = "34004b35-14d8-5ef3-9330-4cdb6864b03a" -version = "0.3.8" +version = "2.7.1+0" [[deps.IfElse]] git-tree-sha1 = "debdd00ffef04665ccbb3e150747a77560e8fad1" @@ -182,9 +176,9 @@ uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" [[deps.InverseFunctions]] deps = ["Test"] -git-tree-sha1 = "a7254c0acd8e62f1ac75ad24d5db43f5f19f3c65" +git-tree-sha1 = "91b5dcf362c5add98049e6c29ee756910b03051d" uuid = "3587e190-3f89-42d0-90ee-14403ec27112" -version = "0.1.2" +version = "0.1.3" [[deps.InvertedIndices]] git-tree-sha1 = "bee5f1ef5bf65df56bdd2e40447590b272a5471f" @@ -209,9 +203,9 @@ version = "1.4.1" [[deps.LayoutPointers]] deps = ["ArrayInterface", "LinearAlgebra", "ManualMemory", "SIMDTypes", "Static"] -git-tree-sha1 = "6dd77ee76188b0365f7d882d674b95796076fa2c" +git-tree-sha1 = "b651f573812d6c36c22c944dd66ef3ab2283dfa1" uuid = "10f19ff3-798f-405d-979b-55457f8fc047" -version = "0.1.5" +version = "0.1.6" [[deps.LibCURL]] deps = ["LibCURL_jll", "MozillaCACerts_jll"] @@ -238,9 +232,9 @@ uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" [[deps.LogExpFunctions]] deps = ["ChainRulesCore", "ChangesOfVariables", "DocStringExtensions", "InverseFunctions", "IrrationalConstants", "LinearAlgebra"] -git-tree-sha1 = "e5718a00af0ab9756305a0392832c8952c7426c1" +git-tree-sha1 = "76c987446e8d555677f064aaac1145c4c17662f8" uuid = "2ab3a3ac-af41-5b50-aa03-7779005ae688" -version = "0.3.6" +version = "0.3.14" [[deps.Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" @@ -266,9 +260,9 @@ uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" [[deps.Measurements]] deps = ["Calculus", "LinearAlgebra", "Printf", "RecipesBase", "Requires"] -git-tree-sha1 = "58390f5617544fb09d27244749484fee0cae6712" +git-tree-sha1 = "88cd033eb781c698e75ae0b680e5cef1553f0856" uuid = "eff96d63-e80a-5855-80a2-b1b0885c5ab7" -version = "2.7.0" +version = "2.7.1" [[deps.Missings]] deps = ["DataAPI"] @@ -281,18 +275,13 @@ uuid = "a63ad114-7e13-5084-954f-fe012c677804" [[deps.MonteCarloMeasurements]] deps = ["Distributed", "Distributions", "LinearAlgebra", "MacroTools", "Random", "RecipesBase", "Requires", "SLEEFPirates", "StaticArrays", "Statistics", "StatsBase", "Test"] -git-tree-sha1 = "bce0a32d6c64165388eec2573b68000ed06f39c1" +git-tree-sha1 = "03619e255664666b352a5e5f6b45e8b00d439870" uuid = "0987c9cc-fe09-11e8-30f0-b96dd679fdca" -version = "1.0.7" +version = "1.0.8" [[deps.MozillaCACerts_jll]] uuid = "14a3606d-f60d-562e-9121-12d972cd8159" -[[deps.NaNMath]] -git-tree-sha1 = "b086b7ea07f8e38cf122f5016af580881ac914fe" -uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" -version = "0.3.7" - [[deps.NetworkOptions]] uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" @@ -317,9 +306,9 @@ version = "1.4.1" [[deps.PDMats]] deps = ["LinearAlgebra", "SparseArrays", "SuiteSparse"] -git-tree-sha1 = "ee26b350276c51697c9c2d88a072b339f9f03d73" +git-tree-sha1 = "3114946c67ef9925204cc024a73c9e679cebe0d7" uuid = "90014a1f-27ba-587c-ab20-58faa44d9150" -version = "0.11.5" +version = "0.11.8" [[deps.Pkg]] deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"] @@ -327,15 +316,15 @@ uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" [[deps.PooledArrays]] deps = ["DataAPI", "Future"] -git-tree-sha1 = "db3a23166af8aebf4db5ef87ac5b00d36eb771e2" +git-tree-sha1 = "a6062fe4063cdafe78f4a0a81cfffb89721b30e7" uuid = "2dfb63ee-cc39-5dd5-95bd-886bf059d720" -version = "1.4.0" +version = "1.4.2" [[deps.Preferences]] deps = ["TOML"] -git-tree-sha1 = "2cf929d64681236a2e074ffafb8d568733d2e6af" +git-tree-sha1 = "47e5f437cc0e7ef2ce8406ce1e7e24d44915f88d" uuid = "21216c6a-2e73-6563-6e65-726566657250" -version = "1.2.3" +version = "1.3.0" [[deps.PrettyTables]] deps = ["Crayons", "Formatting", "Markdown", "Reexport", "Tables"] @@ -399,9 +388,9 @@ version = "0.1.0" [[deps.SLEEFPirates]] deps = ["IfElse", "Static", "VectorizationBase"] -git-tree-sha1 = "3a5ae1db486e4ce3ccd2b392389943481e20401f" +git-tree-sha1 = "ac399b5b163b9140f9c310dfe9e9aaa225617ff6" uuid = "476501e8-09a2-5ece-8869-fb82de89a1fa" -version = "0.6.29" +version = "0.6.32" [[deps.Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" @@ -425,21 +414,21 @@ uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [[deps.SpecialFunctions]] deps = ["ChainRulesCore", "IrrationalConstants", "LogExpFunctions", "OpenLibm_jll", "OpenSpecFun_jll"] -git-tree-sha1 = "85e5b185ed647b8ee89aa25a7788a2b43aa8a74f" +git-tree-sha1 = "5ba658aeecaaf96923dce0da9e703bd1fe7666f9" uuid = "276daf66-3868-5448-9aa4-cd146d93841b" -version = "2.1.3" +version = "2.1.4" [[deps.Static]] deps = ["IfElse"] -git-tree-sha1 = "00b725fffc9a7e9aac8850e4ed75b4c1acbe8cd2" +git-tree-sha1 = "91181e5820a400d1171db4382aa36e7fd19bee27" uuid = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" -version = "0.5.5" +version = "0.6.3" [[deps.StaticArrays]] deps = ["LinearAlgebra", "Random", "Statistics"] -git-tree-sha1 = "95c6a5d0e8c69555842fc4a927fc485040ccc31c" +git-tree-sha1 = "cd56bf18ed715e8b09f06ef8c6b781e6cdc49911" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "1.3.5" +version = "1.4.4" [[deps.Statistics]] deps = ["LinearAlgebra", "SparseArrays"] @@ -447,9 +436,9 @@ uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" [[deps.StatsAPI]] deps = ["LinearAlgebra"] -git-tree-sha1 = "c3d8ba7f3fa0625b062b82853a7d5229cb728b6b" +git-tree-sha1 = "c82aaa13b44ea00134f8c9c89819477bd3986ecd" uuid = "82ae8749-77ed-4fe6-ae5f-f523153014b0" -version = "1.2.1" +version = "1.3.0" [[deps.StatsBase]] deps = ["DataAPI", "DataStructures", "LinearAlgebra", "LogExpFunctions", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"] @@ -458,10 +447,10 @@ uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" version = "0.33.16" [[deps.StatsFuns]] -deps = ["ChainRulesCore", "HypergeometricFunctions", "InverseFunctions", "IrrationalConstants", "LogExpFunctions", "Reexport", "Rmath", "SpecialFunctions"] -git-tree-sha1 = "25405d7016a47cf2bd6cd91e66f4de437fd54a07" +deps = ["ChainRulesCore", "InverseFunctions", "IrrationalConstants", "LogExpFunctions", "Reexport", "Rmath", "SpecialFunctions"] +git-tree-sha1 = "5950925ff997ed6fb3e985dcce8eb1ba42a0bbe7" uuid = "4c63d2b9-4356-54db-8cca-17b64c39e42c" -version = "0.9.16" +version = "0.9.18" [[deps.SuiteSparse]] deps = ["Libdl", "LinearAlgebra", "Serialization", "SparseArrays"] @@ -478,10 +467,10 @@ uuid = "3783bdb8-4a98-5b6b-af9a-565f29a5fe9c" version = "1.0.1" [[deps.Tables]] -deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"] -git-tree-sha1 = "bb1064c9a84c52e277f1096cf41434b675cd368b" +deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "OrderedCollections", "TableTraits", "Test"] +git-tree-sha1 = "5ce79ce186cc678bbb5c5681ca3379d1ddae11a1" uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" -version = "1.6.1" +version = "1.7.0" [[deps.Tar]] deps = ["ArgTools", "SHA"] @@ -506,9 +495,9 @@ version = "1.11.0" [[deps.VectorizationBase]] deps = ["ArrayInterface", "CPUSummary", "HostCPUFeatures", "Hwloc", "IfElse", "LayoutPointers", "Libdl", "LinearAlgebra", "SIMDTypes", "Static"] -git-tree-sha1 = "e9a35d501b24c127af57ca5228bcfb806eda7507" +git-tree-sha1 = "858e541ffc21873e45aeaf744e0d015966e0328e" uuid = "3d5dd08c-fd9d-11e8-17fa-ed2836048c2f" -version = "0.21.24" +version = "0.21.30" [[deps.Zlib_jll]] deps = ["Libdl"] diff --git a/docs/src/Functions.md b/docs/src/Functions.md index b93f02d..74e6a3f 100644 --- a/docs/src/Functions.md +++ b/docs/src/Functions.md @@ -1,5 +1,7 @@ # Functions +## Overview + ```@meta CurrentModule = ModiaResult ``` From 809192217b9b279fe89b84754dce3aa2f501e013 Mon Sep 17 00:00:00 2001 From: "Martin.Otter@dlr.de" Date: Mon, 2 May 2022 18:08:13 +0200 Subject: [PATCH 14/14] Internal bug fixed and version incremented --- Project.toml | 2 +- docs/src/index.md | 5 +++++ src/Utilities.jl | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Project.toml b/Project.toml index fc274b5..b8c9d4f 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.4.2" +version = "0.4.3" [deps] DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" diff --git a/docs/src/index.md b/docs/src/index.md index 22def20..e2cebd0 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -138,6 +138,11 @@ are different to the Python 2.x version. ## Release Notes +### Version 0.4.3 + +- Internal bug fixed. + + ### Version 0.4.2 - `printResultInfo(..)` and `resultInfo(..)` improved diff --git a/src/Utilities.jl b/src/Utilities.jl index a1dcd89..92a4f46 100644 --- a/src/Utilities.jl +++ b/src/Utilities.jl @@ -455,7 +455,7 @@ function signalInfo2(result, name::AbstractString) valueUnit = unit(value[1]) else hasDimensionMismatch(signal, name, timeSignal, timeSignalName(result)) - return (sigType, signalLength(timeSignal), nothing, typeof(value), nothing) + return (sigType, signalLength(timeSignal), nothing, typeof(value), nothing, oneSigValue) end if typeof(value) <: MonteCarloMeasurements.Particles