A substituter

Author: shashi

src/systems/jumps/jumpsystem.jl

@@ -91,12 +91,12 @@ function assemble_crj(js, crj, statetoid)
 end
 
 function assemble_maj(js, maj::MassActionJump{U,Vector{Pair{V,W}},Vector{Pair{V2,W2}}},
-                      statetoid, parammap) where {U,V,W,V2,W2}
+                      statetoid, subber) where {U,V,W,V2,W2}
     sr = maj.scaled_rates
     if sr isa Operation
-        pval = simplify(substitute(sr,parammap)).value
+        pval = subber(sr).value
     elseif sr isa Variable
-        pval = Dict(parammap)[sr()]
+        pval = subber(sr()).value
     else
         pval = maj.scaled_rates
     end
@@ -167,7 +167,8 @@ function DiffEqJump.JumpProblem(js::JumpSystem, prob, aggregator; kwargs...)
     parammap  = map((x,y)->Pair(x(),y), parameters(js), prob.p)
     eqs       = equations(js)
 
-    majs = MassActionJump[assemble_maj(js, j, statetoid, parammap) for j in eqs.x[1]]
+    subber = substituter(first.(parammap), last.(parammap))
+    majs = MassActionJump[assemble_maj(js, j, statetoid, subber) for j in eqs.x[1]]
     crjs = ConstantRateJump[assemble_crj(js, j, statetoid) for j in eqs.x[2]]
     vrjs = VariableRateJump[assemble_vrj(js, j, statetoid) for j in eqs.x[3]]
     ((prob isa DiscreteProblem) && !isempty(vrjs)) && error("Use continuous problems such as an ODEProblem or a SDEProblem with VariableRateJumps") 
@@ -210,4 +211,4 @@ function modified_states!(mstates, jump::MassActionJump, sts)
     for (state,stoich) in jump.net_stoch
         (state.op in sts) && push!(mstates, state)
     end
-end
+end

src/utils.jl

@@ -121,12 +121,16 @@ substitute(expr::Operation, s::Pair) = _substitute(expr, [s[1]], [s[2]])
 substitute(expr::Operation, dict::Dict) = _substitute(expr, keys(dict), values(dict))
 substitute(expr::Operation, s::Vector) = _substitute(expr, first.(s), last.(s))
 
-function _substitute(expr, ks, vs)
-    _substitute(expr, Dict(map(Pair, map(to_symbolic, ks), map(to_symbolic, vs))))
+function _substitute(ks, vs)
+    expr -> _substitute(expr, Dict(map(Pair, map(to_symbolic, ks), map(to_symbolic, vs))))
 end
 
-function _substitute(expr, dict::Dict)
-    simplify(SymbolicUtils.substitute(expr, dict))
+function substituter(ks, vs)
+    dict = Dict(map(Pair, map(to_symbolic, ks), map(to_symbolic, vs)))
+    expr -> to_mtk(SymbolicUtils.simplify(SymbolicUtils.substitute(expr, dict)))
 end
 
-@deprecate substitute_expr!(expr,s) substitute(expr,s)
+_substitute(expr, ks, vs) = substituter(ks, vs)(expr)
+
+@deprecate substitute_expr!(expr,s) substitute(expr,s)
+