Skip to content

Commit 4d18458

Browse files
Merge pull request #10 from JuliaDiffEq/myb/v0.7
WIP: Fix depwarns
2 parents f78dc01 + fe472e8 commit 4d18458

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/DiffEqDevTools.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ module DiffEqDevTools
55
using DiffEqBase, RecipesBase, RecursiveArrayTools, DiffEqPDEBase,
66
DiffEqMonteCarlo, DiffEqNoiseProcess, Juno
77

8+
using Statistics
9+
810
import Base: length
911

1012
import DiffEqBase: AbstractODEProblem, AbstractDDEProblem,

src/convergence.jl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ function ConvergenceSimulation(solutions,convergence_axis;
2323
errors[k] = additional_errors[k]
2424
end
2525
end
26-
𝒪est = Dict(map(calc𝒪estimates,errors))
26+
𝒪est = Dict((calc𝒪estimates(p) for p = pairs(errors)))
27+
#𝒪est = Dict(map(calc𝒪estimates,errors))
2728
𝒪esttmp = Dict() #Makes Dict of Any to be more compatible
2829
for (k,v) in 𝒪est
2930
if length(v)==1 push!(𝒪esttmp,Pair(k,v[1]))
@@ -119,11 +120,11 @@ function calc𝒪estimates(error::Pair)
119120
key = error.first
120121
error =error.second
121122
if ndims(error)>1 error=mean(error,1) end
122-
S = Vector{eltype(error)}(length(error)-1)
123+
S = Vector{eltype(error)}(undef, length(error)-1)
123124
for i=1:length(error)-1
124125
S[i] = log2(error[i+1]/error[i])
125126
end
126-
return(Pair(key,abs.(mean(S,1))))
127+
return(Pair(key,abs.(mean(S,dims=1))))
127128
end
128129

129130
"""

0 commit comments

Comments
 (0)