Skip to content

Commit 0df5804

Browse files
fix: move initializeprob typeasserts to OverrideInitData
1 parent 03aa8a2 commit 0df5804

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

src/initialization.jl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,10 @@ struct OverrideInitData{IProb, UIProb, IProbMap, IProbPmap}
2323
the parameter object of the original problem.
2424
"""
2525
initializeprobpmap::IProbPmap
26+
27+
function OverrideInitData(initprob::I, update_initprob!::J, initprobmap::K,
28+
initprobpmap::L) where {I, J, K, L}
29+
@assert initprob isa Union{NonlinearProblem, NonlinearLeastSquaresProblem}
30+
return new{I, J, K, L}(initprob, update_initprob!, initprobmap, initprobpmap)
31+
end
2632
end

src/scimlfunctions.jl

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2483,9 +2483,6 @@ function ODEFunction{iip, specialize}(f;
24832483
initialization_data, initializeprob, update_initializeprob!,
24842484
initializeprobmap, initializeprobpmap)
24852485

2486-
@assert typeof(initdata.initializeprob) <:
2487-
Union{Nothing, NonlinearProblem, NonlinearLeastSquaresProblem}
2488-
24892486
if specialize === NoSpecialize
24902487
ODEFunction{iip, specialize,
24912488
Any, Any, Any, Any,
@@ -2756,8 +2753,6 @@ function SplitFunction{iip, specialize}(f1, f2;
27562753
initdata = reconstruct_initialization_data(
27572754
initialization_data, initializeprob, update_initializeprob!,
27582755
initializeprobmap, initializeprobpmap)
2759-
@assert typeof(initdata.initializeprob) <:
2760-
Union{Nothing, NonlinearProblem, NonlinearLeastSquaresProblem}
27612756

27622757
if specialize === NoSpecialize
27632758
SplitFunction{iip, specialize, Any, Any, Any, Any, Any, Any, Any, Any, Any,
@@ -3445,9 +3440,6 @@ function DAEFunction{iip, specialize}(f;
34453440
initialization_data, initializeprob, update_initializeprob!,
34463441
initializeprobmap, initializeprobpmap)
34473442

3448-
@assert typeof(initdata.initializeprob) <:
3449-
Union{Nothing, NonlinearProblem, NonlinearLeastSquaresProblem}
3450-
34513443
if specialize === NoSpecialize
34523444
DAEFunction{iip, specialize, Any, Any, Any,
34533445
Any, Any, Any, Any, Any,
@@ -4455,7 +4447,7 @@ end
44554447
function has_initializeprobpmap(f::AbstractSciMLFunction)
44564448
__has_initializeprobpmap(f) && f.initialization_data.initializeprobpmap !== nothing
44574449
end
4458-
function has_initialization_data(f::AbstractSciMLFunction)
4450+
function has_initialization_data(f)
44594451
__has_initialization_data(f) && f.initialization_data !== nothing
44604452
end
44614453

0 commit comments

Comments
 (0)