add JumpSystem dependency graph tests

Author: isaacsas

src/ModelingToolkit.jl

@@ -131,7 +131,7 @@ export calculate_hessian, generate_hessian
 export calculate_massmatrix, generate_diffusion_function
 
 export BipartiteGraph, equation_dependencies, variable_dependencies
-export eqeq_dendencies, varvar_dependencies
+export eqeq_dependencies, varvar_dependencies
 export asgraph, asdigraph
 
 export simplified_expr, rename, get_variables

src/systems/dependency_graphs.jl

@@ -37,6 +37,13 @@ function asgraph(eqdeps, vtois)
     BipartiteGraph(ne, fadjlist, badjlist)
 end
 
+function Base.isequal(bg1::BipartiteGraph{T}, bg2::BipartiteGraph{T}) where {T<:Integer} 
+    iseq = (bg1.ne == bg2.ne)
+    iseq &= (bg1.fadjlist == bg2.fadjlist) 
+    iseq &= (bg1.badjlist == bg2.badjlist) 
+    iseq
+end
+
 # could be made to directly generate graph and save memory
 function asgraph(sys::AbstractSystem; variables=nothing, variablestoids=nothing)
     vs     = isnothing(variables) ? states(sys) : variables    
@@ -89,7 +96,7 @@ function asdigraph(g::BipartiteGraph, sys::AbstractSystem; variables = states(sy
 end
 
 # maps the i'th eq to equations that depend on it
-function eqeq_dendencies(eqdeps::BipartiteGraph{T}, vardeps::BipartiteGraph{T}) where {T <: Integer}
+function eqeq_dependencies(eqdeps::BipartiteGraph{T}, vardeps::BipartiteGraph{T}) where {T <: Integer}
     g = SimpleDiGraph{T}(length(eqdeps.fadjlist))
 
     for (eqidx,sidxs) in enumerate(vardeps.badjlist)
@@ -104,4 +111,4 @@ function eqeq_dendencies(eqdeps::BipartiteGraph{T}, vardeps::BipartiteGraph{T})
 end
 
 # maps the i'th variable to variables that depend on it
-varvar_dependencies(eqdeps::BipartiteGraph{T}, vardeps::BipartiteGraph{T}) where {T <: Integer} = eqeq_dendencies(vardeps, eqdeps)
+varvar_dependencies(eqdeps::BipartiteGraph{T}, vardeps::BipartiteGraph{T}) where {T <: Integer} = eqeq_dependencies(vardeps, eqdeps)

test/dep_graphs.jl

@@ -0,0 +1,74 @@
+using ModelingToolkit, LightGraphs
+
+# use a ReactionSystem to generate systems for testing
+@parameters k1 k2 t
+@variables S(t) I(t) R(t)
+
+rxs = [Reaction(k1, nothing, [S]),
+       Reaction(k1, [S], nothing),
+       Reaction(k2, [S,I], [I], [1,1], [2]),
+       Reaction(k2, [S,R], [S], [2,1], [2]),
+       Reaction(k1*I, nothing, [R]),
+       Reaction(k1*k2/(1+t), [S], [R])]
+rs = ReactionSystem(rxs, t, [S,I,R], [k1,k2])
+
+
+################################# 
+#      testing for Jumps 
+#################################
+js = convert(JumpSystem, rs)
+S  = convert(Variable,S); I = convert(Variable,I); R = convert(Variable,R)
+k1 = convert(Variable,k1); k2 = convert(Variable,k2)
+
+# eq to vars they depend on
+eq_sdeps  = [Variable[], [S], [S,I], [S,R], [I], [S]]
+eq_sidepsf = [Int[], [1], [1,2], [1,3], [2], [1]]
+eq_sidepsb = [[2,3,4,6], [3,5],[4]]
+deps = equation_dependencies(js)
+@test all(i -> isequal(Set(eq_sdeps[i]),Set(deps[i])), 1:length(rxs))
+depsbg = asgraph(js)
+@test depsbg.fadjlist == eq_sidepsf
+@test depsbg.badjlist == eq_sidepsb
+
+# eq to params they depend on
+eq_pdeps    = [[k1],[k1],[k2],[k2],[k1],[k1,k2]]
+eq_pidepsf = [[1],[1],[2],[2],[1],[1,2]]
+eq_pidepsb = [[1,2,5,6],[3,4,6]]
+deps = equation_dependencies(js, variables=parameters(js))
+@test all(i -> isequal(Set(eq_pdeps[i]),Set(deps[i])), 1:length(rxs))
+depsbg2 = asgraph(js, variables=parameters(js))
+@test depsbg2.fadjlist == eq_pidepsf
+@test depsbg2.badjlist == eq_pidepsb
+
+# var to eqs that modify them
+s_eqdepsf = [[1,2,3,6],[3],[4,5,6]]
+s_eqdepsb = [[1],[1],[1,2],[3],[3],[1,3]]
+ne        = 8
+bg        = BipartiteGraph(ne, s_eqdepsf, s_eqdepsb)
+deps2     = variable_dependencies(js)
+@test isequal(bg,deps2)
+
+# eq to eqs that depend on them
+eq_eqdeps = [[2,3,4,6],[2,3,4,6],[2,3,4,5,6],[4],[4],[2,3,4,6]]
+dg = SimpleDiGraph(6)
+for (eqidx,eqdeps) in enumerate(eq_eqdeps)
+    for eqdepidx in eqdeps
+       add_edge!(dg, eqidx, eqdepidx)
+    end
+end
+dg3 = eqeq_dependencies(depsbg,deps2)
+@test dg == dg3
+
+# var to vars they depend on
+var_vardeps = [[1,2,3],[1,2,3],[3]]
+ne = 7
+dg = SimpleDiGraph(3)
+for (vidx,vdeps) in enumerate(var_vardeps)
+    for vdepidx in vdeps
+       add_edge!(dg, vidx, vdepidx)
+    end
+end
+dg4 = varvar_dependencies(depsbg,deps2)
+@test dg == dg4
+
+   

test/runtests.jl

@@ -19,5 +19,6 @@ using SafeTestsets, Test
 @safetestset "PDE Construction Test" begin include("pde.jl") end
 @safetestset "Lowering Integration Test" begin include("lowering_solving.jl") end
 @safetestset "Test Big System Usage" begin include("bigsystem.jl") end
+@safetestset "Depdendency Graph Test" begin include("dep_graphs.jl")
 #@testset "Latexify recipes Test" begin include("latexify.jl") end
 @testset "Distributed Test" begin include("distributed.jl") end