diff --git a/src/DelayDiffEq.jl b/src/DelayDiffEq.jl index d360675..f4f99c3 100644 --- a/src/DelayDiffEq.jl +++ b/src/DelayDiffEq.jl @@ -35,7 +35,6 @@ export Discontinuity, MethodOfSteps include("discontinuity_type.jl") include("functionwrapper.jl") -include("ddestats.jl") include("integrators/type.jl") include("integrators/utils.jl") diff --git a/src/ddestats.jl b/src/ddestats.jl deleted file mode 100644 index 421376d..0000000 --- a/src/ddestats.jl +++ /dev/null @@ -1,34 +0,0 @@ -mutable struct DDEStats - nf::Int - nf2::Int - nw::Int - nsolve::Int - njacs::Int - nnonliniter::Int - nnonlinconvfail::Int - nfpiter::Int - nfpconvfail::Int - ncondition::Int - naccept::Int - nreject::Int - maxeig::Float64 -end - -DDEStats(x::Int = -1) = DDEStats(x, x, x, x, x, x, x, x, x, x, x, x, 0.0) - -function Base.show(io::IO, s::DDEStats) - println(io, summary(s)) - @printf io "%-60s %-d\n" "Number of function 1 evaluations:" s.nf - @printf io "%-60s %-d\n" "Number of function 2 evaluations:" s.nf2 - @printf io "%-60s %-d\n" "Number of W matrix evaluations:" s.nw - @printf io "%-60s %-d\n" "Number of linear solves:" s.nsolve - @printf io "%-60s %-d\n" "Number of Jacobians created:" s.njacs - @printf io "%-60s %-d\n" "Number of nonlinear solver iterations:" s.nnonliniter - @printf io "%-60s %-d\n" "Number of nonlinear solver convergence failures:" s.nnonlinconvfail - @printf io "%-60s %-d\n" "Number of fixed-point solver iterations:" s.nfpiter - @printf io "%-60s %-d\n" "Number of fixed-point solver convergence failures:" s.nfpconvfail - @printf io "%-60s %-d\n" "Number of rootfind condition calls:" s.ncondition - @printf io "%-60s %-d\n" "Number of accepted steps:" s.naccept - @printf io "%-60s %-d" "Number of rejected steps:" s.nreject - iszero(s.maxeig) || @printf io "\n%-60s %-d" "Maximum eigenvalue recorded:" s.maxeig -end diff --git a/src/integrators/type.jl b/src/integrators/type.jl index c11c679..eaa1f44 100644 --- a/src/integrators/type.jl +++ b/src/integrators/type.jl @@ -89,7 +89,7 @@ mutable struct DDEIntegrator{algType, IIP, uType, tType, P, eigenType, tTypeNoUn u_modified::Bool isdae::Bool opts::O - stats::DDEStats + stats::SciMLBase.DEStats history::H differential_vars::DV integrator::IType diff --git a/src/solve.jl b/src/solve.jl index 319e352..7a1e938 100644 --- a/src/solve.jl +++ b/src/solve.jl @@ -166,7 +166,7 @@ function DiffEqBase.__init(prob::DiffEqBase.AbstractDDEProblem, Val(isinplace(prob))) # separate statistics of the integrator and the history - stats = DDEStats(0) + stats = SciMLBase.DEStats(0) # create solution alg_choice = iscomposite(alg) ? Int[] : nothing