Skip to content

Add NullParaemeters default. #542

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
ChrisRackauckas merged 2 commits into from
Aug 4, 2020
Merged

Add NullParaemeters default. #542

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc58b20
Add NullParaemeters default.
TorkelE Aug 4, 2020
f0197bf
Update typeof check fro u0.
TorkelE Aug 4, 2020
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
16 changes: 8 additions & 8 deletions src/systems/reaction/reactionsystem.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,25 +457,25 @@ end


# ODEProblem from AbstractReactionNetwork
function DiffEqBase.ODEProblem(rs::ReactionSystem, u0::Union{AbstractArray, Number}, tspan, p, args...; kwargs...)
function DiffEqBase.ODEProblem(rs::ReactionSystem, u0::Union{AbstractArray, Number}, tspan, p=DiffEqBase.NullParameters(), args...; kwargs...)
u0 = typeof(u0) <: Array{<:Pair} ? u0 : Pair.(rs.states,u0)
p = typeof(p) <: Array{<:Pair} ? p : Pair.(rs.ps,p)
p = typeof(p) <: Union{Array{<:Pair},DiffEqBase.NullParameters} ? p : Pair.(rs.ps,p)
return ODEProblem(convert(ODESystem,rs),u0,tspan,p, args...; kwargs...)
end

# SDEProblem from AbstractReactionNetwork
function DiffEqBase.SDEProblem(rs::ReactionSystem, u0::Union{AbstractArray, Number}, tspan, p, args...; noise_scaling=nothing::Union{Operation,Nothing}, kwargs...)
function DiffEqBase.SDEProblem(rs::ReactionSystem, u0::Union{AbstractArray, Number}, tspan, p=DiffEqBase.NullParameters(), args...; noise_scaling=nothing::Union{Operation,Nothing}, kwargs...)
sde_sys = convert(SDESystem,rs,noise_scaling=noise_scaling)
u0 = typeof(u0) <: Array{<:Pair} ? u0 : Pair.(rs.states,u0)
p = typeof(p) <: Array{<:Pair} ? p : Pair.(sde_sys.ps,p)
p = typeof(p) <: Union{Array{<:Pair},DiffEqBase.NullParameters} ? p : Pair.(sde_sys.ps,p)
p_matrix = zeros(length(rs.states), length(rs.eqs))
return SDEProblem(sde_sys,u0,tspan,p,args...; noise_rate_prototype=p_matrix,kwargs...)
end

# DiscreteProblem from AbstractReactionNetwork
function DiffEqBase.DiscreteProblem(rs::ReactionSystem, u0::Union{AbstractArray, Number}, tspan::Tuple, p=nothing, args...; kwargs...)
function DiffEqBase.DiscreteProblem(rs::ReactionSystem, u0::Union{AbstractArray, Number}, tspan::Tuple, p=DiffEqBase.NullParameters(), args...; kwargs...)
u0 = typeof(u0) <: Array{<:Pair} ? u0 : Pair.(rs.states,u0)
p = typeof(p) <: Array{<:Pair} ? p : Pair.(rs.ps,p)
p = typeof(p) <: Union{Array{<:Pair},DiffEqBase.NullParameters} ? p : Pair.(rs.ps,p)
return DiscreteProblem(convert(JumpSystem,rs), u0,tspan,p, args...; kwargs...)
end

Expand All @@ -485,9 +485,9 @@ function DiffEqJump.JumpProblem(rs::ReactionSystem, prob, aggregator, args...; k
end

# SteadyStateProblem from AbstractReactionNetwork
function DiffEqBase.SteadyStateProblem(rs::ReactionSystem, u0::Union{AbstractArray, Number}, p, args...; kwargs...)
function DiffEqBase.SteadyStateProblem(rs::ReactionSystem, u0::Union{AbstractArray, Number}, p=DiffEqBase.NullParameters(), args...; kwargs...)
#u0 = typeof(u0) <: Array{<:Pair} ? u0 : Pair.(rs.states,u0)
#p = typeof(p) <: Array{<:Pair} ? p : Pair.(rs.ps,p)
#p = typeof(p) <: Union{Array{<:Pair},DiffEqBase.NullParameters} ? p : Pair.(rs.ps,p)
return SteadyStateProblem(ODEFunction(convert(ODESystem,rs)),u0,p, args...; kwargs...)
end

Expand Down