update

Author: TorkelE

ext/CatalystHomotopyContinuationExtension/homotopy_continuation_extension.jl

@@ -44,7 +44,7 @@ end
 
 # For a given reaction system, parameter values, and initial conditions, find the polynomial that HC solves to find steady states.
 function steady_state_polynomial(rs_in::ReactionSystem, ps, u0)
-    rs = ModelingToolkit.@set rs_in.rxs = [expand_registered_functions(rx) for rx in rn.rxs]
+    rs = ModelingToolkit.@set rs_in.rxs = [Catalyst.expand_registered_functions(rx) for rx in rs_in.rxs]
     ns = convert(NonlinearSystem, rs; remove_conserved = true)
     pre_varmap = [symmap_to_varmap(rs,u0)..., symmap_to_varmap(rs,ps)...]
     conservationlaw_errorcheck(rs, pre_varmap)

src/registered_functions.jl

@@ -128,7 +128,7 @@ function expand_registered_functions(expr)
         return args[3]*(args[1]^args[5])/((args[1])^args[5] + (args[2])^args[5] + (args[4])^args[5])
     end
     for i = 1:length(args)
-        args[i] = expand_registered_functions!(args[i])
+        args[i] = expand_registered_functions(args[i])
     end
     return expr
 end

test/extensions/homotopy_continuation.jl

@@ -79,11 +79,12 @@ end
 
 # Tests that non-scalar reaction rates work.
 # Tests that rational polynomial steady state systems work. 
+# Tests that Hill function is correctly expanded even if nested.
 # Test filter_negative=false works.
-# tests than non-integer exponents throws an error.
+# Tests than non-integer exponents throws an error.
 let 
     rs = @reaction_network begin
-        0.1 + hill(X,v,K,n), 0 --> X
+        v*(0.1/v + hill(X,1,K,n)), 0 --> X
         d, X --> 0
     end
     ps = [:v => 5.0, :K => 2.5, :n => 3, :d => 1.0]