Merge pull request #876 from SciML/myb/sub

Remove `Num` substitute overloads.

Author: YingboMa

Project.toml

@@ -65,7 +65,7 @@ Setfield = "0.7"
 SpecialFunctions = "0.7, 0.8, 0.9, 0.10, 1.0"
 StaticArrays = "0.10, 0.11, 0.12, 1.0"
 SymbolicUtils = "0.8.3, 0.9"
-Symbolics = "0.1.2"
+Symbolics = "0.1.7"
 TreeViews = "0.3"
 UnPack = "0.1, 1.0"
 Unitful = "1.1"

src/ModelingToolkit.jl

@@ -43,7 +43,8 @@ import Symbolics: rename, get_variables!, _solve, hessian_sparsity,
                   BuildTargets, JuliaTarget, StanTarget, CTarget, MATLABTarget,
                   ParallelForm, SerialForm, MultithreadedForm, build_function,
                   unflatten_long_ops, rhss, lhss, prettify_expr, gradient,
-                  jacobian, hessian, derivative, sparsejacobian, sparsehessian
+                  jacobian, hessian, derivative, sparsejacobian, sparsehessian,
+                  substituter
 
 import DiffEqBase: @add_kwonly
 

src/utils.jl

@@ -35,44 +35,6 @@ end
 
 modified_states!(mstates, e::Equation, statelist=nothing) = get_variables!(mstates, e.lhs, statelist)
 
-# variable substitution
-# Piracy but mild
-"""
-    substitute(expr, s::Pair)
-    substitute(expr, s::Dict)
-    substitute(expr, s::Vector)
-
-Performs the substitution on `expr` according to rule(s) `s`.
-
-# Examples
-```julia
-julia> @parameters t
-(t,)
-
-julia> @variables x y z(t)
-(x, y, z(t))
-
-julia> ex = x + y + sin(z)
-(x + y) + sin(z(t))
-
-julia> substitute(ex, Dict([x => z, sin(z) => z^2]))
-(z(t) + y) + (z(t) ^ 2)
-```
-"""
-# cannot use Union{Pair, Vector, Dict} -- leads to ambiguity
-substitute(expr::Num, s::Pair; kw...) = Num(substituter(s)(value(expr); kw...))
-substitute(expr::Num, s::Vector; kw...) = Num(substituter(s)(value(expr); kw...))
-substitute(expr::Num, s::Dict; kw...) = Num(substituter(s)(value(expr); kw...))
-# TODO: move this to SymbolicUtils
-substitute(expr, s::Pair; kw...) = substituter([s[1] => s[2]])(expr; kw...)
-substitute(expr, s::Vector; kw...) = substituter(s)(expr; kw...)
-
-substituter(pair::Pair) = substituter((pair,))
-function substituter(pairs)
-    dict = Dict(value(k) => value(v)  for (k, v) in pairs)
-    (expr; kw...) -> SymbolicUtils.substitute(expr, dict; kw...)
-end
-
 macro showarr(x)
     n = string(x)
     quote