add tests

Author: TorkelE

src/reactionsystem.jl

@@ -1297,9 +1297,7 @@ function Base.convert(::Type{<:ODESystem}, rs::ReactionSystem; name = nameof(rs)
     eqs, sts, ps, obs, defs = addconstraints!(eqs, fullrs, ists, ispcs; remove_conserved)
 
     # Converts expressions like mm(X,v,K) to v*X/(X+K).
-    expand_functions && for eq in eqs
-        eq.rhs = expand_registered_functions!(eq.rhs)
-    end
+    expand_functions  && (eqs = [eq.lhs ~ expand_registered_functions!(eq.rhs) for eq in eqs])
 
     ODESystem(eqs, get_iv(fullrs), sts, ps;
               observed = obs,
@@ -1342,9 +1340,7 @@ function Base.convert(::Type{<:NonlinearSystem}, rs::ReactionSystem; name = name
     eqs, sts, ps, obs, defs = addconstraints!(eqs, fullrs, ists, ispcs; remove_conserved)
 
     # Converts expressions like mm(X,v,K) to v*X/(X+K).
-    expand_functions && for eq in eqs
-        eq.rhs = expand_registered_functions!(eq.rhs)
-    end
+    expand_functions  && (eqs = [eq.lhs ~ expand_registered_functions!(eq.rhs) for eq in eqs])
 
     NonlinearSystem(eqs, sts, ps;
                     name,
@@ -1412,8 +1408,9 @@ function Base.convert(::Type{<:SDESystem}, rs::ReactionSystem;
     ps = (noise_scaling === nothing) ? ps : vcat(ps, toparam(noise_scaling))
 
     # Converts expressions like mm(X,v,K) to v*X/(X+K).
-    expand_functions && for eq in eqs
-        eq.rhs = expand_registered_functions!(eq.rhs)
+    if expand_functions
+        eqs = [eq.lhs ~ expand_registered_functions!(eq.rhs) for eq in eqs]
+        noiseeqs = [expand_registered_functions!(neq) for neq in noiseeqs]
     end
 
     if any(isbc, get_states(flatrs))

test/dsl/custom_functions.jl

@@ -204,3 +204,25 @@ let
                   v * (X^n) * ((K^n + Y^n) * log(X) - (K^n) * log(K) - (Y^n) * log(Y)) /
                   (K^n + X^n + Y^n)^2)
 end
+
+### Test expand_functions = true Argument ###
+let 
+    rn_funcs = @reaction_network rn begin
+        mm(X1,v,K), 0 --> X1
+        mmr(X2,v,K), 0 --> X2
+        hill(X3,v,K,n), 0 --> X3
+        hillr(X4,v,K,n), 0 --> X4
+        hillar(X5,Y,v,K,n), 0 --> X5
+    end
+    rn_expanded = @reaction_network rn begin
+        v*X1/(X1+K), 0 --> X1
+        v*K/(X2+K), 0 --> X2
+        v*(X3^n)/(X3^n+K^n), 0 --> X3
+        v*(K^n)/(X4^n+K^n), 0 --> X4
+        v*(X5^n)/(X5^n+Y^n+K^n), 0 --> X5
+    end
+    @test convert(ODESystem, rn_funcs; expand_functions = true) == convert(ODESystem, rn_expanded)
+    @test convert(SDESystem, rn_funcs; expand_functions = true) == convert(SDESystem, rn_expanded)
+    @test convert(NonlinearSystem, rn_funcs; expand_functions = true) == convert(NonlinearSystem, rn_expanded)
+    @test convert(ODESystem, rn_funcs; expand_functions = false) != convert(ODESystem, rn_expanded)    
+end