finish off dependency graphs

Author: isaacsas

src/ModelingToolkit.jl

@@ -18,7 +18,7 @@ using RecursiveArrayTools
 import SymbolicUtils
 import SymbolicUtils: to_symbolic, FnType
 
-import LightGraphs: SimpleDiGraph
+import LightGraphs: SimpleDiGraph, add_edge!
 
 import TreeViews
 
@@ -130,6 +130,9 @@ export calculate_factorized_W, generate_factorized_W
 export calculate_hessian, generate_hessian
 export calculate_massmatrix, generate_diffusion_function
 
+export BipartiteGraph, equation_dependencies, variable_dependencies, eqeq_dendencies, varvar_dependencies
+export asgraph, asdigraph
+
 export simplified_expr, rename, get_variables
 export simplify, substitute
 export build_function

src/systems/dependency_graphs.jl

@@ -69,7 +69,7 @@ function variable_dependencies(sys::AbstractSystem; variables=states(sys), varia
 end
 
 # convert BipartiteGraph to LightGraph.SimpleDiGraph
-function digraph(g::BipartiteGraph, sys::AbstractSystem; variables = states(sys), equationsfirst = true)
+function asdigraph(g::BipartiteGraph, sys::AbstractSystem; variables = states(sys), equationsfirst = true)
     neqs     = length(equations(sys))
     nvars    = length(variables)
     fadjlist = deepcopy(g.fadjlist)
@@ -87,3 +87,33 @@ function digraph(g::BipartiteGraph, sys::AbstractSystem; variables = states(sys)
 
     SimpleDiGraph(g.ne, fadjlist, badjlist)
 end
+
+# maps the i'th eq to equations that depend on it
+function eqeq_dendencies(eqdeps::BipartiteGraph{T}, vardeps::BipartiteGraph{T}) where {T <: Integer}
+    g = SimpleDiGraph{T}(length(eqdeps.fadjlist))
+    
+    for (eqidx,sidxs) in enumerate(vardeps.badjlist)
+        # states modified by eqidx
+        for sidx in sidxs
+            # equations depending on sidx
+            foreach(v -> add_edge!(g, eqidx, v), eqdeps.badjlist[sidx])
+        end
+    end
+
+    g
+end
+
+# maps the i'th variable to variables that depend on it
+function varvar_dependencies(eqdeps::BipartiteGraph{T}, vardeps::BipartiteGraph{T}) where {T <: Integer}
+    g = SimpleDiGraph{T}(length(vardeps.fadjlist))
+    
+    for (sidx,eqidxs) in enumerate(eqdeps.badjlist)
+        # eqs modified by eqidx
+        for eqidx in eqidxs
+            # states depending on eqidx
+            foreach(v -> add_edge!(g, sidx, v), vardeps.badjlist[eqidx])
+        end
+    end
+
+    g
+end

src/systems/jumps/jumpsystem.jl

@@ -39,6 +39,7 @@ generate_affect_function(js, affect, outputidxs) = build_function(affect, states
                                                       expression=Val{false},
                                                       headerfun=add_integrator_header,
                                                       outputidxs=outputidxs)[2]
+                                                      
 function assemble_vrj(js, vrj, statetoid)
     rate   = generate_rate_function(js, vrj.rate)
     outputvars = (convert(Variable,affect.lhs) for affect in vrj.affect!)