Skip to content

Commit 07fdb85

Browse files
author
oscarddssmith
committed
fix ordering
1 parent 5ce4abd commit 07fdb85

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/initialization.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Check if the algebraic constraints are satisfied, and error if they aren't. Retu
100100
the `u0` and `p` as-is, and is always successful if it returns. Valid only for
101101
`ODEProblem` and `DAEProblem`. Requires a `DEIntegrator` as its second argument.
102102
"""
103-
function get_initial_values(prob::ODEProblem, integrator, f, alg::CheckInit,
103+
function get_initial_values(prob::AbstractODEProblem, integrator, f, alg::CheckInit,
104104
isinplace::Union{Val{true}, Val{false}}; kwargs...)
105105
u0 = state_values(integrator)
106106
p = parameter_values(integrator)
@@ -135,7 +135,7 @@ function _evaluate_f_dae(integrator, f, isinplace::Val{false}, args...)
135135
return f(args...)
136136
end
137137

138-
function get_initial_values(prob::DAEProblem, integrator, f, alg::CheckInit,
138+
function get_initial_values(prob::AbstractDAEProblem, integrator, f, alg::CheckInit,
139139
isinplace::Union{Val{true}, Val{false}}; kwargs...)
140140
u0 = state_values(integrator)
141141
p = parameter_values(integrator)

src/scimlfunctions.jl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ numerically-defined functions.
401401
"""
402402
struct ODEFunction{iip, specialize, F, TMM, Ta, Tt, TJ, JVP, VJP, JP, SP, TW, TWt, WP, TPJ,
403403
O, TCV,
404-
SYS, ID<:OverrideInitData, NLP<:ODE_NLProbData} <: AbstractODEFunction{iip}
404+
SYS, ID<:Union{Nothing, OverrideInitData}, NLP<:Union{Nothing, ODE_NLProbData}} <: AbstractODEFunction{iip}
405405
f::F
406406
mass_matrix::TMM
407407
analytic::Ta
@@ -522,8 +522,7 @@ information on generating the SplitFunction from this symbolic engine.
522522
"""
523523
struct SplitFunction{
524524
iip, specialize, F1, F2, TMM, C, Ta, Tt, TJ, JVP, VJP, JP, WP, SP, TW, TWt,
525-
TPJ, O,
526-
TCV, SYS, ID<:OverrideInitData, NLP<:ODE_NLProbData} <: AbstractODEFunction{iip}
525+
TPJ, O, TCV, SYS, ID<:Union{Nothing, OverrideInitData}, NLP<:Union{Nothing, ODE_NLProbData}} <: AbstractODEFunction{iip}
527526
f1::F1
528527
f2::F2
529528
mass_matrix::TMM

0 commit comments

Comments
 (0)