Skip to content

Commit

Permalink
Auto stash before merge of "pr/387" and "origin/master"
Browse files Browse the repository at this point in the history
  • Loading branch information
isaacsas committed Mar 20, 2024
1 parent f4e4a80 commit 7a279c6
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 13 deletions.
2 changes: 1 addition & 1 deletion src/aggregators/coevolve.jl
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ end

# executing jump at the next jump time
function (p::CoevolveJumpAggregation)(integrator::I) where {I <:
AbstractSSAIntegrator}
AbstractSSAIntegrator}
if !accept_next_jump!(p, integrator, integrator.u, integrator.p, integrator.t)
return nothing
end
Expand Down
3 changes: 1 addition & 2 deletions src/aggregators/ssajump.jl
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ end
end

@inline function concretize_affects!(p::AbstractSSAJumpAggregator{T, S, F1, F2},
::I) where {T, S, F1, F2 <: Tuple,
I <: DiffEqBase.DEIntegrator}
::I) where {T, S, F1, F2 <: Tuple, I <: DiffEqBase.DEIntegrator}
nothing
end

Expand Down
16 changes: 6 additions & 10 deletions src/problem.jl
Original file line number Diff line number Diff line change
Expand Up @@ -154,14 +154,12 @@ function JumpProblem(prob, jumps::AbstractJump...; kwargs...)
JumpProblem(prob, JumpSet(jumps...); kwargs...)
end

function JumpProblem(
prob, aggregator::AbstractAggregatorAlgorithm, jumps::ConstantRateJump;
kwargs...)
function JumpProblem(prob, aggregator::AbstractAggregatorAlgorithm,
jumps::ConstantRateJump; kwargs...)
JumpProblem(prob, aggregator, JumpSet(jumps); kwargs...)
end
function JumpProblem(
prob, aggregator::AbstractAggregatorAlgorithm, jumps::VariableRateJump;
kwargs...)
function JumpProblem(prob, aggregator::AbstractAggregatorAlgorithm,
jumps::VariableRateJump; kwargs...)
JumpProblem(prob, aggregator, JumpSet(jumps); kwargs...)
end
function JumpProblem(prob, aggregator::AbstractAggregatorAlgorithm, jumps::RegularJump;
Expand Down Expand Up @@ -324,8 +322,7 @@ function extend_problem(prob::DiffEqBase.AbstractSDEProblem, jumps; rng = DEFAUL
end

ttype = eltype(prob.tspan)
u0 = ExtendedJumpArray(prob.u0,
[-randexp(rng, ttype) for i in 1:length(jumps)])
u0 = ExtendedJumpArray(prob.u0, [-randexp(rng, ttype) for i in 1:length(jumps)])
remake(prob, f = SDEFunction{isinplace(prob)}(jump_f, jump_g), g = jump_g, u0 = u0)
end

Expand All @@ -350,8 +347,7 @@ function extend_problem(prob::DiffEqBase.AbstractDDEProblem, jumps; rng = DEFAUL
end

ttype = eltype(prob.tspan)
u0 = ExtendedJumpArray(prob.u0,
[-randexp(rng, ttype) for i in 1:length(jumps)])
u0 = ExtendedJumpArray(prob.u0, [-randexp(rng, ttype) for i in 1:length(jumps)])
remake(prob, f = DDEFunction{isinplace(prob)}(jump_f), u0 = u0)
end

Expand Down

0 comments on commit 7a279c6

Please sign in to comment.