Merge 902e2fc into c045289

Project.toml

@@ -41,7 +41,7 @@ RecursiveArrayTools = "3.12"
 Reexport = "1.0"
 SciMLBase = "2.30.1"
 StaticArrays = "1.9"
-SymbolicIndexingInterface = "0.3.11"
+SymbolicIndexingInterface = "0.3.13"
 UnPack = "1.0.2"
 julia = "1.10"
 

src/problem.jl

@@ -125,14 +125,11 @@ function Base.setindex!(prob::JumpProblem, args...; kwargs...)
 end
 
 # for updating parameters in JumpProblems to update MassActionJumps
-function SII.set_parameter!(prob::JumpProblem, val, idx)
-    ans = SII.set_parameter!(SII.parameter_values(prob), val, idx)
-
+function SII.finalize_parameters_hook!(prob::JumpProblem, p)
     if using_params(prob.massaction_jump)
         update_parameters!(prob.massaction_jump, prob.prob.p)
     end
-
-    ans
+    nothing
 end
 
 # when getindex is used.

test/jprob_symbol_indexing.jl

@@ -34,3 +34,63 @@ p1setter(jprob, [4.0, 10.0])
 @test jprob.ps[:p1] == 4.0
 @test jprob.ps[:p2] == 10.0
 @test jprob.massaction_jump.scaled_rates == [4.0, 10.0]
+
+# integrator tests
+# note that `setu` is not currently supported as `set_u!` is not implemented for SSAStepper
+integ = init(jprob, SSAStepper())
+@test getu(integ, [:a, :b])(integ) == [20, 10]
+integ[[:b, :a]] = [40, 5]
+@test getu(integ, [:a, :b])(integ) == [5, 40]
+@test getp(integ, :p2)(integ) == 10.0
+setp(integ, :p2)(integ, 15.0)
+@test getp(integ, :p2)(integ) == 15.0
+@test jprob.massaction_jump.scaled_rates[2] == 10.0  # jump rate not updated
+reset_aggregated_jumps!(integ)
+@test jprob.massaction_jump.scaled_rates[2] == 15.0  # jump rate now updated
+
+# remake tests
+dprob = DiscreteProblem(g, [0, 10], (0.0, 10.0), [1.0, 2.0])
+jprob = JumpProblem(dprob, Direct(), crj1, crj2, maj)
+jprob = remake(jprob; u0 = [:a => -10, :b => 100], p = [:p2 => 3.5, :p1 => .5])
+@test jprob.prob.u0 == [-10, 100]
+@test jprob.prob.p == [.5, 3.5]
+@test jprob.massaction_jump.scaled_rates == [.5, 3.5]
+jprob = remake(jprob; u0 = [:b => 10], p = [:p2 => 4.5])
+@test jprob.prob.u0 == [-10, 10]
+@test jprob.prob.p == [.5, 4.5]
+@test jprob.massaction_jump.scaled_rates == [.5, 4.5]
+
+# test updating problems via regular indexing still updates the mass action jump
+dprob = DiscreteProblem(g, [0, 10], (0.0, 10.0), [1.0, 2.0])
+jprob = JumpProblem(dprob, Direct(), crj1, crj2, maj)
+@test jprob.massaction_jump.scaled_rates[1] == 1.0
+jprob.ps[1] = 3.0
+@test jprob.ps[1] == 3.0
+@test jprob.massaction_jump.scaled_rates[1] == 3.0
+
+# test updating integrators via regular indexing
+dprob = DiscreteProblem(g, [0, 10], (0.0, 10.0), [1.0, 2.0])
+jprob = JumpProblem(dprob, Direct(), crj1, crj2, maj)
+integ = init(jprob, SSAStepper())
+integ.u .= [40, 5]
+@test getu(integ, [1, 2])(integ) == [40, 5]
+@test getp(integ, 2)(integ) == 2.0
+@test integ.p[2] == 2.0
+@test jprob.massaction_jump.scaled_rates[2] == 2.0
+setp(integ, 2)(integ, 15.0)
+@test integ.p[2] == 15.0
+@test getp(integ, 2)(integ) == 15.0
+reset_aggregated_jumps!(integ)
+@test jprob.massaction_jump.scaled_rates[2] == 15.0  # jump rate now updated
+
+# remake tests for regular indexing
+dprob = DiscreteProblem(g, [0, 10], (0.0, 10.0), [1.0, 2.0])
+jprob = JumpProblem(dprob, Direct(), crj1, crj2, maj)
+jprob = remake(jprob; u0 = [-10, 100], p = [.5, 3.5])
+@test jprob.prob.u0 == [-10, 100]
+@test jprob.prob.p == [.5, 3.5]
+@test jprob.massaction_jump.scaled_rates == [.5, 3.5]
+jprob = remake(jprob; u0 = [2 => 10], p = [2 => 4.5])
+@test jprob.prob.u0 == [-10, 10]
+@test jprob.prob.p == [.5, 4.5]
+@test jprob.massaction_jump.scaled_rates == [.5, 4.5]

test/runtests.jl

@@ -28,6 +28,7 @@ using JumpProcesses, DiffEqBase, SafeTestsets
     @time @safetestset "Thread Safety test" begin include("thread_safety.jl") end
     @time @safetestset "A + B <--> C" begin include("reversible_binding.jl") end
     @time @safetestset "Remake tests" begin include("remake_test.jl") end
+    @time @safetestset "Symbol based problem indexing" begin include("jprob_symbol_indexing.jl") end
     @time @safetestset "Long time accuracy test" begin include("longtimes_test.jl") end
     @time @safetestset "Hawkes process" begin include("hawkes_test.jl") end
     @time @safetestset "Reaction rates" begin include("spatial/reaction_rates.jl") end
@@ -37,5 +38,4 @@ using JumpProcesses, DiffEqBase, SafeTestsets
     @time @safetestset "Spatial A + B <--> C" begin include("spatial/ABC.jl") end
     @time @safetestset "Spatially Varying Reaction Rates" begin include("spatial/spatial_majump.jl") end
     @time @safetestset "Pure diffusion" begin include("spatial/diffusion.jl") end
-    @time @safetestset "Symbol based problem indexing" begin include("jprob_symbol_indexing.jl") end
 end