make depgraphs for jumps

Author: isaacsas

src/systems/jumps/jumpsystem.jl

@@ -124,7 +124,19 @@ function DiffEqJump.JumpProblem(js::JumpSystem, prob, aggregator; kwargs...)
     ((prob isa DiscreteProblem) && !isempty(vrjs)) && error("Use continuous problems such as an ODEProblem or a SDEProblem with VariableRateJumps")
 
     jset = JumpSet(Tuple(vrjs), Tuple(crjs), nothing, isempty(majs) ? nothing : majs)
-    JumpProblem(prob, aggregator, jset)
+
+    if needs_vartojumps_map(aggregator) || needs_depgraph(aggregator)
+        jdeps = asgraph(js)
+        vdeps = variable_dependencies(js)
+        vtoj = jdeps.badjlist
+        jtov = vdeps.badjlist
+
+        jtoj = needs_depgraph(aggregator) ? eqeq_dependencies(jdeps, vdeps).fadjlist : nothing
+    else
+        vtoj = nothing; jtov = nothing; jtoj = nothing
+    end
+
+    JumpProblem(prob, aggregator, jset; dep_graph=jtoj, vartojumps_map=vtoj, jumptovars_map=jtov)
 end
 
 

test/jumpsystem.jl

@@ -118,6 +118,16 @@ jprob = JumpProblem(js3, dprob, Direct())
 m3 = getmean(jprob,Nsims)
 @test abs(m-m3)/m < .01
 
+# maj jump test with dep graphs
+js3b = JumpSystem([maj1,maj2], t, [S,I,R], [β,γ])
+jprobb = JumpProblem(js3b, dprob, RSSA())
+#m4 = getmean(jprobb,Nsims)
+#@test abs(m-m4)/m < .01
+
+jprobc = JumpProblem(js3b, dprob, DirectCR())
+#m5 = getmean(jprobc,Nsims)
+#@test abs(m-m5)/m < .01
+
 # mass action jump tests for other reaction types (zero order, decay)
 maj1 = MassActionJump(2.0, [0 => 1], [S => 1])
 maj2 = MassActionJump(γ, [S => 1], [S => -1])
@@ -138,3 +148,4 @@ ptoid     = Dict(convert(Variable,par) => i for (i,par) in enumerate(parameters(
 dprob = DiscreteProblem(js4, [S => 999], (0,1000.), [β => 100.,γ => .01])
 jprob = JumpProblem(js4, dprob, Direct())
 sol = solve(jprob, SSAStepper());
+