Merge pull request #171 from SciML/pl/fix_is_event_assignment

add test for is_event_assignment

Author: paulflang

Project.toml

@@ -1,7 +1,7 @@
 name = "SBMLToolkit"
 uuid = "86080e66-c8ac-44c2-a1a0-9adaadfe4a4e"
 authors = ["paulflang", "anandijain"]
-version = "0.1.29"
+version = "0.1.30"
 
 [deps]
 Catalyst = "479239e8-5488-4da2-87a7-35f2df7eef83"

src/drafts.jl

@@ -1,5 +1,5 @@
 function is_event_assignment(k, model)
-    for ev in values(model.events)
+    for ev in last.(model.events)
         for as in ev.event_assignments
             if as.variable == k
                 return true

src/systems.jl

@@ -87,11 +87,21 @@ function Catalyst.ReactionSystem(model::SBML.Model; kwargs...)  # Todo: requires
         #                         Dict(Catalyst.DEFAULT_IV.val => 0)))
         push!(raterules_subs, rhs ~ o.lhs)
     end
+    zero_rates = []
+    for (k, v) in merge(model.parameters, model.compartments)
+        if is_event_assignment(k, model)
+            if v.constant
+                ErrorException("$k appears in event assignment but should be constant.")
+            end
+            push!(zero_rates, D(create_var(k, IV; isbcspecies = true)) ~ 0)
+        end
+    end
     if haskey(kwargs, :defaults)
         defs = ModelingToolkit._merge(defs, kwargs[:defaults])
         kwargs = filter(x -> !isequal(first(x), :defaults), kwargs)
     end
-    rs = ReactionSystem([rxs..., algrules..., raterules_subs..., obsrules_rearranged...],
+    rs = ReactionSystem(
+        [rxs..., algrules..., raterules_subs..., obsrules_rearranged..., zero_rates...],
         IV, first.(u0map), first.(parammap);
         defaults = defs, name = gensym(:SBML),
         continuous_events = get_events(model),

test/simresults.jl

@@ -8,7 +8,8 @@ const case_ids = [7,  # boundary_condition
     140,  # compartment size overridden with assignmentRule
     170,  # Model using parameters and rules only
     325,  # One reactions and two rate rules with four species in a 2D compartment
-    679  # Initial value calculated by assignmentRule in compartment of non-unit size    # 1208, # Non-hOSU species with rateRule in variable compartment -> require MTK fix.
+    679,  # Initial value calculated by assignmentRule in compartment of non-unit size    # 1208, # Non-hOSU species with rateRule in variable compartment -> require MTK fix.
+    944  # Non-constant parameter as target of event_assignment
 ]
 
 const logdir = joinpath(@__DIR__, "logs")