Skip to content

Tiny fix of Coevolve() with the dependency graph check #282

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 3 commits into from
Jan 5, 2023
Merged

Tiny fix of Coevolve() with the dependency graph check #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e7fa80
Update coevolve.jl
Jan 5, 2023
e310141
add test
isaacsas Jan 5, 2023
d6021f9
format
isaacsas Jan 5, 2023
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
2 changes: 1 addition & 1 deletion src/aggregators/coevolve.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function CoevolveJumpAggregation(nj::Int, njt::T, et::T, crs::Vector{T}, sr::Not
rng::RNG; u::U, dep_graph = nothing, lrates, urates,
rateintervals, haslratevec) where {T, S, F1, F2, RNG, U}
if dep_graph === nothing
if (get_num_majumps(maj) == 0) || !isempty(rs)
if (get_num_majumps(maj) == 0) || !isempty(urates)
error("To use Coevolve a dependency graph between jumps must be supplied.")
else
dg = make_dependency_graph(length(u), maj)
Expand Down
29 changes: 29 additions & 0 deletions test/variable_rate.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,3 +144,32 @@ x₀ = 1.0 + 0.0im
prob = ODEProblem(f4, [x₀], Δt)
jumpProblem = JumpProblem(prob, Direct(), jump)
sol = solve(jumpProblem, Tsit5())

# test to check lack of dependency graphs is caught in Coevolve for systems with non-maj
# jumps
let
maj_rate = [1.0]
react_stoich_ = [Vector{Pair{Int, Int}}()]
net_stoich_ = [[1 => 1]]
mass_action_jump_ = MassActionJump(maj_rate, react_stoich_, net_stoich_;
scale_rates = false)

affect! = function (integrator)
integrator.u[1] -= 1
end
cs_rate1(u, p, t) = 0.2 * u[1]
constant_rate_jump = ConstantRateJump(cs_rate1, affect!)
jumpset_ = JumpSet((), (constant_rate_jump,), nothing, mass_action_jump_)

u0 = [0]
tspan = (0.0, 30.0)
dprob_ = DiscreteProblem(u0, tspan)
alg = Coevolve()
@test_throws ErrorException JumpProblem(dprob_, alg, jumpset_,
save_positions = (false, false))

vrj = VariableRateJump(cs_rate1, affect!; urate = ((u, p, t) -> 1.0),
rateinterval = ((u, p, t) -> 1.0))
@test_throws ErrorException JumpProblem(dprob_, alg, mass_action_jump_, vrj;
save_positions = (false, false))
end