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

fix vector interpolation and remove unnecessary @inbounds #478

Merged
merged 1 commit into from
Aug 10, 2023
Merged

fix vector interpolation and remove unnecessary @inbounds #478

Show file tree
Hide file tree
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
44 changes: 22 additions & 22 deletions src/interpolation.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@
u = id.u
typeof(id) <: HermiteInterpolation && (du = id.du)
tdir = sign(t[end] - t[1])
t[end] == t[1] && tval != t[end] &&
error("Solution interpolation cannot extrapolate from a single timepoint. Either solve on a longer timespan or use the local extrapolation from the integrator interface.")
idx = sortperm(tvals, rev = tdir < 0)
i = 2 # Start the search thinking it's between t[1] and t[2]
t[end] == t[1] && (tvals[idx[1]] != t[1] || tvals[idx[end]] != t[1]) &&
error("Solution interpolation cannot extrapolate from a single timepoint. Either solve on a longer timespan or use the local extrapolation from the integrator interface.")
tdir * tvals[idx[end]] > tdir * t[end] &&
error("Solution interpolation cannot extrapolate past the final timepoint. Either solve on a longer timespan or use the local extrapolation from the integrator interface.")
tdir * tvals[idx[1]] < tdir * t[1] &&
Expand All @@ -98,25 +98,25 @@
else
vals = Vector{eltype(u)}(undef, length(tvals))
end
@inbounds for j in idx
for j in idx
tval = tvals[j]
i = searchsortedfirst(@view(t[i:end]), tval, rev = tdir < 0) + i - 1 # It's in the interval t[i-1] to t[i]
avoid_constant_ends = deriv != Val{0} #|| typeof(tval) <: ForwardDiff.Dual
avoid_constant_ends && i == 1 && (i += 1)
if !avoid_constant_ends && t[i] == tval
if !avoid_constant_ends && t[i - 1] == tval # Can happen if it's the first value!
if idxs === nothing
vals[j] = u[i - 1]
else
vals[j] = u[i - 1][idxs]
end
elseif !avoid_constant_ends && t[i] == tval
lasti = lastindex(t)
k = continuity == :right && i + 1 <= lasti && t[i + 1] == tval ? i + 1 : i
if idxs === nothing
vals[j] = u[k]
else
vals[j] = u[k][idxs]
end
elseif !avoid_constant_ends && t[i - 1] == tval # Can happen if it's the first value!
if idxs === nothing
vals[j] = u[i - 1]
else
vals[j] = u[i - 1][idxs]
end
else
typeof(id) <: SensitivityInterpolation && error(SENSITIVITY_INTERP_MESSAGE)
dt = t[i] - t[i - 1]
Expand Down Expand Up @@ -145,33 +145,33 @@
u = id.u
typeof(id) <: HermiteInterpolation && (du = id.du)
tdir = sign(t[end] - t[1])
t[end] == t[1] && tval != t[end] &&
error("Solution interpolation cannot extrapolate from a single timepoint. Either solve on a longer timespan or use the local extrapolation from the integrator interface.")
idx = sortperm(tvals, rev = tdir < 0)
i = 2 # Start the search thinking it's between t[1] and t[2]
t[end] == t[1] && (tvals[idx[1]] != t[1] || tvals[idx[end]] != t[1]) &&

Check warning on line 150 in src/interpolation.jl

View check run for this annotation

Codecov / codecov/patch

src/interpolation.jl#L150 

Added line #L150 was not covered by tests
error("Solution interpolation cannot extrapolate from a single timepoint. Either solve on a longer timespan or use the local extrapolation from the integrator interface.")
tdir * tvals[idx[end]] > tdir * t[end] &&
error("Solution interpolation cannot extrapolate past the final timepoint. Either solve on a longer timespan or use the local extrapolation from the integrator interface.")
tdir * tvals[idx[1]] < tdir * t[1] &&
error("Solution interpolation cannot extrapolate before the first timepoint. Either start solving earlier or use the local extrapolation from the integrator interface.")
@inbounds for j in idx
for j in idx

Check warning on line 156 in src/interpolation.jl

View check run for this annotation

Codecov / codecov/patch

src/interpolation.jl#L156 

Added line #L156 was not covered by tests
tval = tvals[j]
i = searchsortedfirst(@view(t[i:end]), tval, rev = tdir < 0) + i - 1 # It's in the interval t[i-1] to t[i]
avoid_constant_ends = deriv != Val{0} #|| typeof(tval) <: ForwardDiff.Dual
avoid_constant_ends && i == 1 && (i += 1)
if !avoid_constant_ends && t[i] == tval
if !avoid_constant_ends && t[i - 1] == tval # Can happen if it's the first value!
if idxs === nothing
vals[j] = u[i - 1]

Check warning on line 163 in src/interpolation.jl

View check run for this annotation

Codecov / codecov/patch

src/interpolation.jl#L161-L163 

Added lines #L161 - L163 were not covered by tests
else
vals[j] = u[i - 1][idxs]

Check warning on line 165 in src/interpolation.jl

View check run for this annotation

Codecov / codecov/patch

src/interpolation.jl#L165 

Added line #L165 was not covered by tests
end
elseif !avoid_constant_ends && t[i] == tval

Check warning on line 167 in src/interpolation.jl

View check run for this annotation

Codecov / codecov/patch

src/interpolation.jl#L167 

Added line #L167 was not covered by tests
lasti = lastindex(t)
k = continuity == :right && i + 1 <= lasti && t[i + 1] == tval ? i + 1 : i
if idxs === nothing
vals[j] = u[k]
else
vals[j] = u[k][idxs]
end
elseif !avoid_constant_ends && t[i - 1] == tval # Can happen if it's the first value!
if idxs === nothing
vals[j] = u[i - 1]
else
vals[j] = u[i - 1][idxs]
end
else
typeof(id) <: SensitivityInterpolation && error(SENSITIVITY_INTERP_MESSAGE)
dt = t[i] - t[i - 1]
Expand Down Expand Up @@ -217,7 +217,7 @@
@inbounds i = searchsortedfirst(t, tval, rev = tdir < 0) # It's in the interval t[i-1] to t[i]
avoid_constant_ends = deriv != Val{0} #|| typeof(tval) <: ForwardDiff.Dual
avoid_constant_ends && i == 1 && (i += 1)
@inbounds if !avoid_constant_ends && t[i] == tval
if !avoid_constant_ends && t[i] == tval
lasti = lastindex(t)
k = continuity == :right && i + 1 <= lasti && t[i + 1] == tval ? i + 1 : i
if idxs === nothing
Expand Down Expand Up @@ -267,7 +267,7 @@
@inbounds i = searchsortedfirst(t, tval, rev = tdir < 0) # It's in the interval t[i-1] to t[i]
avoid_constant_ends = deriv != Val{0} #|| typeof(tval) <: ForwardDiff.Dual
avoid_constant_ends && i == 1 && (i += 1)
@inbounds if !avoid_constant_ends && t[i] == tval
if !avoid_constant_ends && t[i] == tval

Check warning on line 270 in src/interpolation.jl

View check run for this annotation

Codecov / codecov/patch

src/interpolation.jl#L270 

Added line #L270 was not covered by tests
lasti = lastindex(t)
k = continuity == :right && i + 1 <= lasti && t[i + 1] == tval ? i + 1 : i
if idxs === nothing
Expand Down
4 changes: 3 additions & 1 deletion test/solution_interface.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ end
ode = ODEProblem(f, 1.0, (0.0, 1.0))
sol = SciMLBase.build_solution(ode, :NoAlgorithm, [ode.tspan[begin]], [ode.u0])
@test sol(0.0) == 1.0
@test sol([0.0,0.0]) == [1.0, 1.0]
# test that indexing out of bounds doesn't segfault
@test_throws ErrorException sol(1.0)
@test_throws ErrorException sol(1)
@test_throws ErrorException sol(-0.5)
@test_throws ErrorException sol([0, -0.5, 0])
end
Loading