Skip to content

Commit

Permalink
Merge pull request #2886 from AayushSabharwal/as/sde-isdiag
Browse files Browse the repository at this point in the history
fix: create specialized `isdiag` for symbolics in noise matrix
  • Loading branch information
ChrisRackauckas authored Jul 22, 2024
2 parents 9b7e139 + b5dc2ea commit d309381
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 1 deletion.
9 changes: 8 additions & 1 deletion src/systems/diffeqs/sdesystem.jl
Original file line number Diff line number Diff line change
Expand Up @@ -244,13 +244,20 @@ function Base.:(==)(sys1::SDESystem, sys2::SDESystem)
all(s1 == s2 for (s1, s2) in zip(get_systems(sys1), get_systems(sys2)))
end

function __num_isdiag(mat)
for i in axes(mat, 1), j in axes(mat, 2)
i == j || isequal(mat[i, j], 0) || return false
end
return true
end

function generate_diffusion_function(sys::SDESystem, dvs = unknowns(sys),
ps = full_parameters(sys); isdde = false, kwargs...)
eqs = get_noiseeqs(sys)
if isdde
eqs = delay_to_function(sys, eqs)
end
if eqs isa AbstractMatrix && isdiag(eqs)
if eqs isa AbstractMatrix && __num_isdiag(eqs)
eqs = diag(eqs)
end
u = map(x -> time_varying_as_func(value(x), sys), dvs)
Expand Down
26 changes: 26 additions & 0 deletions test/sdesystem.jl
Original file line number Diff line number Diff line change
Expand Up @@ -722,3 +722,29 @@ let # test that diagonal noise is correctly handled
# SOSRI only works for diagonal and scalar noise
@test solve(prob, SOSRI()).retcode == ReturnCode.Success
end

@testset "Non-diagonal noise check" begin
@parameters σ ρ β
@variables x(t) y(t) z(t)
@brownian a b c
eqs = [D(x) ~ σ * (y - x) + 0.1a * x + 0.1b * y,
D(y) ~ x *- z) - y + 0.1b * y,
D(z) ~ x * y - β * z + 0.1c * z]
@mtkbuild de = System(eqs, t)

u0map = [
x => 1.0,
y => 0.0,
z => 0.0
]

parammap = [
σ => 10.0,
β => 26.0,
ρ => 2.33
]

prob = SDEProblem(de, u0map, (0.0, 100.0), parammap)
# SOSRI only works for diagonal and scalar noise
@test solve(prob, ImplicitEM()).retcode == ReturnCode.Success
end

0 comments on commit d309381

Please sign in to comment.