up

Author: TorkelE

src/reactionsystem.jl

@@ -728,7 +728,11 @@ end
 # Special dispatch for equations, applied `findvars!` to left-hand and right-hand sides.
 function findvars!(ps, us, eq_to_search::Equation, ivs, vars)
     findvars!(ps, us, eq_to_search.lhs, ivs, vars)
-    findvars!(ps, us, eq_to_search.lhs, ivs, vars)
+    findvars!(ps, us, eq_to_search.rhs, ivs, vars)
+end
+# Special dispatch for Vectors (applies it to each vector element).
+function findvars!(ps, us, exprs_to_search::Vector, ivs, vars)
+    foreach(exprtosearch -> findvars!(ps, us, exprtosearch, ivs, vars), exprs_to_search)
 end
 
 # Called internally (whether DSL-based or programmtic model creation is used). 
@@ -812,22 +816,12 @@ function find_event_vars!(ps, us, events::Vector, ivs, vars)
     foreach(event -> find_event_vars!(ps, us, event, ivs, vars), events)
 end
 # For a single event, adds quantitites from its condition and affect expression(s) to `ps` and `us`.
+# Applies `findvars!` to the event's condition (`event[1])` and affec (`event[2]`).
 function find_event_vars!(ps, us, event, ivs, vars)
-    conds, affects = event
-    # For discrete events, the condition can be a single value (for periodic events).
-    # If not, it is a vector of conditions and we must check each.
-    if conds isa Vector
-        for cond in conds
-            findvars!(ps, us, cond, ivs, vars)
-        end
-    else
-        findvars!(ps, us, conds, ivs, vars)
-    end
-    # The affects is always a vector of equations. Here, we handle the lhs and rhs separately.
-    for affect in affects
-        findvars!(ps, us, cond, ivs, vars)
-    end
+    findvars!(ps, us, event[1], ivs, vars)
+    findvars!(ps, us, event[2], ivs, vars)
 end
+
 """
     remake_ReactionSystem_internal(rs::ReactionSystem; 
         default_reaction_metadata::Vector{Pair{Symbol, T}} = Vector{Pair{Symbol, Any}}()) where {T}

test/reactionsystem_structure/coupled_equation_reaction_systems.jl

@@ -455,8 +455,7 @@ let
             @equations D(D(V)) ~ 1.0 - V
             (p,d), 0 <--> X
         end
-        @test_broken false # Had problem writing this test, need to fix.
-        #@test_warn convert(NonlinearSystem, rs)
+        @test_logs (:warn, r".*") convert(NonlinearSystem, rs)
     end
 
     # Differential on the rhs, should yield a warning.
@@ -466,8 +465,7 @@ let
             @equations D(V) ~ 1.0 - V + D(U)
             (p,d), 0 <--> X
         end
-        @test_broken false # Had problem writing this test, need to fix.
-        #@test_warn convert(NonlinearSystem, rs)
+        @test_logs (:warn, r".*") convert(NonlinearSystem, rs)
     end
 
     # Non-differential term on the lhs, should yield a warning.
@@ -478,8 +476,7 @@ let
             @equations D(V) + V ~ 1.0 - V
             (p,d), 0 <--> X
         end
-        @test_broken false # Had problem writing this test, need to fix.
-        #@test_warn convert(NonlinearSystem, rs)
+        @test_logs (:warn, r".*") convert(NonlinearSystem, rs)
     end
 end
 ### Unusual Differentials Tests ###

test/reactionsystem_structure/designating_parameter_types.jl

@@ -132,6 +132,9 @@ let
         @test unwrap(mtk_struct[X5]) == 0.5
     end
 
+    # This test started working now, probably due to a MTK fix. Need to look at where to put it
+    # back into the test properly though.
+    @test_broken false 
     # Indexing currently broken for NonlinearSystem integrators (MTK intend to support this though).
-    @test_broken unwrap(ninit.ps[p1]) isa Float64
+    @test unwrap(ninit.ps[p1]) isa Float64
 end