Skip to content

fix: fix type inference in remake #982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 9, 2025
Merged

fix: fix type inference in remake #982

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions src/remake.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ function remake(prob::ODEProblem; f = missing,
p = missing,
kwargs = missing,
interpret_symbolicmap = true,
build_initializeprob = true,
build_initializeprob = Val{true},
use_defaults = false,
lazy_initialization = nothing,
_kwargs...)
Expand All @@ -229,7 +229,7 @@ function remake(prob::ODEProblem; f = missing,

iip = isinplace(prob)

if build_initializeprob
if build_initializeprob <: Val{true} || build_initializeprob == true
if f !== missing && has_initialization_data(f)
initialization_data = remake_initialization_data(
prob.f.sys, f, u0, tspan[1], p, newu0, newp)
Expand Down Expand Up @@ -401,15 +401,15 @@ function remake(prob::SDEProblem;
seed = missing,
kwargs = missing,
lazy_initialization = nothing,
build_initializeprob = true,
build_initializeprob = Val{true},
_kwargs...)
if tspan === missing
tspan = prob.tspan
end

newu0, newp = updated_u0_p(prob, u0, p, tspan[1]; interpret_symbolicmap, use_defaults)

if build_initializeprob
if build_initializeprob <: Val{true} || build_initializeprob == true
if f !== missing && has_initialization_data(f)
initialization_data = remake_initialization_data(
prob.f.sys, f, u0, tspan[1], p, newu0, newp)
Expand Down Expand Up @@ -462,15 +462,15 @@ function remake(prob::DDEProblem; f = missing, h = missing, u0 = missing,
tspan = missing, p = missing, constant_lags = missing,
dependent_lags = missing, order_discontinuity_t0 = missing,
neutral = missing, kwargs = missing, interpret_symbolicmap = true,
use_defaults = false, lazy_initialization = nothing, build_initializeprob = true,
use_defaults = false, lazy_initialization = nothing, build_initializeprob = Val{true},
_kwargs...)
if tspan === missing
tspan = prob.tspan
end

newu0, newp = updated_u0_p(prob, u0, p, tspan[1]; interpret_symbolicmap, use_defaults)

if build_initializeprob
if build_initializeprob <: Val{true} || build_initializeprob == true
if f !== missing && has_initialization_data(f)
initialization_data = remake_initialization_data(
prob.f.sys, f, u0, tspan[1], p, newu0, newp)
Expand Down Expand Up @@ -535,15 +535,15 @@ function remake(prob::SDDEProblem;
seed = missing,
kwargs = missing,
lazy_initialization = nothing,
build_initializeprob = true,
build_initializeprob = Val{true},
_kwargs...)
if tspan === missing
tspan = prob.tspan
end

newu0, newp = updated_u0_p(prob, u0, p, tspan[1]; interpret_symbolicmap, use_defaults)

if build_initializeprob
if build_initializeprob <: Val{true} || build_initializeprob == true
if f !== missing && has_initialization_data(f)
initialization_data = remake_initialization_data(
prob.f.sys, f, u0, tspan[1], p, newu0, newp)
Expand Down Expand Up @@ -681,11 +681,11 @@ function remake(prob::NonlinearProblem;
interpret_symbolicmap = true,
use_defaults = false,
lazy_initialization = nothing,
build_initializeprob = true,
build_initializeprob = Val{true},
_kwargs...)
newu0, newp = updated_u0_p(prob, u0, p; interpret_symbolicmap, use_defaults)

if build_initializeprob
if build_initializeprob <: Val{true} || build_initializeprob == true
if f !== missing && has_initialization_data(f)
initialization_data = remake_initialization_data(
prob.f.sys, f, u0, nothing, p, newu0, newp)
Expand Down Expand Up @@ -728,11 +728,11 @@ function remake(prob::SteadyStateProblem;
interpret_symbolicmap = true,
use_defaults = false,
lazy_initialization = nothing,
build_initializeprob = true,
build_initializeprob = Val{true},
_kwargs...)
newu0, newp = updated_u0_p(prob, u0, p; interpret_symbolicmap, use_defaults)

if build_initializeprob
if build_initializeprob <: Val{true} || build_initializeprob == true
if f !== missing && has_initialization_data(f)
initialization_data = remake_initialization_data(
prob.f.sys, f, u0, Inf, p, newu0, newp)
Expand Down Expand Up @@ -769,10 +769,10 @@ Remake the given `NonlinearLeastSquaresProblem`.
"""
function remake(prob::NonlinearLeastSquaresProblem; f = missing, u0 = missing, p = missing,
interpret_symbolicmap = true, use_defaults = false, kwargs = missing,
lazy_initialization = nothing, build_initializeprob = true, _kwargs...)
lazy_initialization = nothing, build_initializeprob = Val{true}, _kwargs...)
newu0, newp = updated_u0_p(prob, u0, p; interpret_symbolicmap, use_defaults)

if build_initializeprob
if build_initializeprob <: Val{true} || build_initializeprob == true
if f !== missing && has_initialization_data(f)
initialization_data = remake_initialization_data(
prob.f.sys, f, u0, nothing, p, newu0, newp)
Expand Down
Loading