@@ -405,7 +405,7 @@ numerically-defined functions.
405405"""
406406struct ODEFunction{iip, specialize, F, TMM, Ta, Tt, TJ, JVP, VJP, JP, SP, TW, TWt, WP, TPJ,
407407 O, TCV, SYS, IProb, IProbMap,
408- NLF<: Union{Nothing, NonlinearFunction} , NLSC, NLISC} <: AbstractODEFunction{iip}
408+ NLF, NLSC, NLISC} <: AbstractODEFunction{iip}
409409 f:: F
410410 mass_matrix:: TMM
411411 analytic:: Ta
@@ -524,7 +524,7 @@ information on generating the SplitFunction from this symbolic engine.
524524struct SplitFunction{
525525 iip, specialize, F1, F2, TMM, C, Ta, Tt, TJ, JVP, VJP, JP, SP, TW, TWt,
526526 TPJ, O, TCV, SYS, IProb, IProbMap,
527- NLF<: Union{Nothing, NonlinearFunction} , NLSC, NLISC} <: AbstractODEFunction{iip}
527+ NLF, NLSC, NLISC} <: AbstractODEFunction{iip}
528528 f1:: F1
529529 f2:: F2
530530 mass_matrix:: TMM
@@ -2424,9 +2424,9 @@ function ODEFunction{iip, specialize}(f;
24242424 colorvec = __has_colorvec (f) ? f. colorvec : nothing ,
24252425 sys = __has_sys (f) ? f. sys : nothing ,
24262426 initializeprob = __has_initializeprob (f) ? f. initializeprob : nothing ,
2427- initializeprobmap = __has_initializeprobmap (f) ? f. initializeprobmap : nothing
2428- nlfunc = __has_nlfunc (f) ? f. nlfunc : nothing
2429- nl_state_compres = __has_nl_state_compres (f) ? f. nl_state_compres : identity
2427+ initializeprobmap = __has_initializeprobmap (f) ? f. initializeprobmap : nothing ,
2428+ nlfunc = __has_nlfunc (f) ? f. nlfunc : nothing ,
2429+ nl_state_compres = __has_nl_state_compres (f) ? f. nl_state_compres : identity,
24302430 nl_state_decompres = __has_nl_state_decompres (f) ? f. nl_state_decompres : identity
24312431) where {iip,
24322432 specialize
@@ -2485,7 +2485,7 @@ function ODEFunction{iip, specialize}(f;
24852485 typeof (sparsity), Any, Any, typeof (W_prototype), Any,
24862486 Any,typeof (_colorvec),
24872487 typeof (sys), Any, Any,
2488- Union{Nothing, NonlinearFunction} , Any, Any}(_f, mass_matrix, analytic, tgrad, jac,
2488+ Any , Any, Any}(_f, mass_matrix, analytic, tgrad, jac,
24892489 jvp, vjp, jac_prototype, sparsity, Wfact,
24902490 Wfact_t, W_prototype, paramjac,
24912491 observed, _colorvec, sys, initializeprob, initializeprobmap,
@@ -2540,8 +2540,8 @@ function unwrapped_f(f::ODEFunction, newf = unwrapped_f(f.f))
25402540 Any, Any, Any, Any, typeof (f. jac_prototype),
25412541 typeof (f. sparsity), Any, Any, Any,
25422542 Any, typeof (f. colorvec),
2543- typeof (f. sys), Any, Any
2544- Union{Nothing, NonlinearFunction} , Any, Any
2543+ typeof (f. sys), Any, Any,
2544+ Any , Any, Any
25452545 }(newf, f. mass_matrix, f. analytic, f. tgrad, f. jac,
25462546 f. jvp, f. vjp, f. jac_prototype, f. sparsity, f. Wfact,
25472547 f. Wfact_t, f. W_prototype, f. paramjac,
@@ -4364,6 +4364,7 @@ __has_analytic_full(f) = isdefined(f, :analytic_full)
43644364__has_resid_prototype (f) = isdefined (f, :resid_prototype )
43654365__has_initializeprob (f) = isdefined (f, :initializeprob )
43664366__has_initializeprobmap (f) = isdefined (f, :initializeprobmap )
4367+ __has_nlfunc (f) = isdefined (f, :nl_func )
43674368__has_nl_state_compres (f) = isdefined (f, :nl_state_compres )
43684369__has_nl_state_decompres (f) = isdefined (f, :nl_state_decompres )
43694370
0 commit comments