Skip to content
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

Jump to bottom

feat: add late binding for tstops #2520

Merged
merged 4 commits into from
Nov 17, 2024
Merged

feat: add late binding for tstops #2520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c0c112f
feat: add late binding for tstops
AayushSabharwal Nov 11, 2024
6c3bbf2
feat: implement `SciMLBase.allows_late_binding_tstops`
AayushSabharwal Nov 12, 2024
f6db0dd
build: bump SciMLBase, DiffEqBase compat
AayushSabharwal Nov 15, 2024
b8a1f43
fix: handle single float as `tstops`
AayushSabharwal Nov 15, 2024
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
4 changes: 2 additions & 2 deletions lib/OrdinaryDiffEqCore/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Accessors = "0.1.36"
Adapt = "3.0, 4"
ArrayInterface = "7"
DataStructures = "0.18"
DiffEqBase = "6.159"
DiffEqBase = "6.160"
DiffEqDevTools = "2.44.4"
DocStringExtensions = "0.9"
EnumX = "1"
Expand All @@ -70,7 +70,7 @@ Random = "<0.0.1, 1"
RecursiveArrayTools = "2.36, 3"
Reexport = "1.0"
SafeTestsets = "0.1.0"
SciMLBase = "2.59.2"
SciMLBase = "2.60"
SciMLOperators = "0.3"
SciMLStructures = "1"
SimpleUnPack = "1"
Expand Down
3 changes: 3 additions & 0 deletions lib/OrdinaryDiffEqCore/src/alg_utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ end

SciMLBase.forwarddiffs_model_time(alg::RosenbrockAlgorithm) = true

SciMLBase.allows_late_binding_tstops(::OrdinaryDiffEqAlgorithm) = true
SciMLBase.allows_late_binding_tstops(::DAEAlgorithm) = true

# isadaptive is defined below.

## OrdinaryDiffEq Internal Traits
Expand Down
13 changes: 13 additions & 0 deletions lib/OrdinaryDiffEqCore/src/solve.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,12 @@ function DiffEqBase.__init(
resType = typeof(res_prototype)
end

if tstops isa AbstractArray || tstops isa Tuple || tstops isa Number
_tstops = nothing
else
_tstops = tstops
tstops = ()
end
tstops_internal = initialize_tstops(tType, tstops, d_discontinuities, tspan)
saveat_internal = initialize_saveat(tType, saveat, tspan)
d_discontinuities_internal = initialize_d_discontinuities(tType, d_discontinuities,
Expand Down Expand Up @@ -542,6 +548,13 @@ function DiffEqBase.__init(
end
end

if _tstops !== nothing
tstops = _tstops(parameter_values(integrator), prob.tspan)
for tstop in tstops
add_tstop!(integrator, tstop)
end
end

handle_dt!(integrator)
integrator
end
Expand Down
12 changes: 12 additions & 0 deletions test/interface/ode_tstops_tests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,15 @@ end
prob = ODEProblem(ff, [0.0], (0.0f0, 1.0f0))
sol = solve(prob, Tsit5(), tstops = [tval], callback = cb)
end

@testset "Late binding tstops" begin
function rhs(u, p, t)
u * p + t
end
prob = ODEProblem(rhs, 1.0, (0.0, 1.0), 0.1; tstops = (p, tspan) -> tspan[1]:p:tspan[2])
sol = solve(prob, Tsit5())
@test 0.0:0.1:1.0 ⊆ sol.t
prob2 = remake(prob; p = 0.07)
sol2 = solve(prob2, Tsit5())
@test 0.0:0.07:1.0 ⊆ sol2.t
end
Loading