Skip to content

Commit d31ee38

Browse files
Merge pull request #789 from SciML/jump
small improvements to JumpProblem dispatches
2 parents 0176fef + 3b54162 commit d31ee38

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/systems/jumps/jumpsystem.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ tspan = (0.0, 250.0)
202202
dprob = DiscreteProblem(js, u₀map, tspan, parammap)
203203
```
204204
"""
205-
function DiffEqBase.DiscreteProblem(sys::JumpSystem, u0map, tspan::Tuple,
205+
function DiffEqBase.DiscreteProblem(sys::JumpSystem, u0map, tspan::Union{Tuple,Nothing},
206206
parammap=DiffEqBase.NullParameters(); kwargs...)
207207
u0 = varmap_to_vars(u0map, states(sys); defaults=default_u0(sys))
208208
p = varmap_to_vars(parammap, parameters(sys); defaults=default_p(sys))
@@ -230,7 +230,7 @@ tspan = (0.0, 250.0)
230230
dprob = DiscreteProblem(js, u₀map, tspan, parammap)
231231
```
232232
"""
233-
function DiscreteProblemExpr(sys::JumpSystem, u0map, tspan::Tuple,
233+
function DiscreteProblemExpr(sys::JumpSystem, u0map, tspan::Union{Tuple,Nothing},
234234
parammap=DiffEqBase.NullParameters(); kwargs...)
235235
u0 = varmap_to_vars(u0map, states(sys); defaults=default_u0(sys))
236236
p = varmap_to_vars(parammap, parameters(sys); defaults=default_p(sys))
@@ -241,7 +241,7 @@ function DiscreteProblemExpr(sys::JumpSystem, u0map, tspan::Tuple,
241241
p = $p
242242
tspan = $tspan
243243
df = DiscreteFunction{true,true}(f, syms=$(Symbol.(states(sys))))
244-
DiscreteProblem(df, u0, tspan, p; kwargs...)
244+
DiscreteProblem(df, u0, tspan, p)
245245
end
246246
end
247247

@@ -262,7 +262,7 @@ function DiffEqJump.JumpProblem(js::JumpSystem, prob, aggregator; kwargs...)
262262

263263
statetoid = Dict(value(state) => i for (i,state) in enumerate(states(js)))
264264
eqs = equations(js)
265-
invttype = typeof(1 / prob.tspan[2])
265+
invttype = prob.tspan[1] === nothing ? Float64 : typeof(1 / prob.tspan[2])
266266

267267
# handling parameter substition and empty param vecs
268268
p = (prob.p == DiffEqBase.NullParameters()) ? Num[] : prob.p

0 commit comments

Comments
 (0)