Merge branch 'master' into ys/makesym

Author: YingboMa

src/direct.jl

@@ -79,6 +79,16 @@ function jacobian_sparsity(du, u)
     sparse(I, J, true, length(du), length(u))
 end
 
+"""
+    exprs_occur_in(exprs::Vector, expr)
+
+Return an array of booleans `finds` where `finds[i]` is true if `exprs[i]` occurs in `expr`
+false otherwise.
+"""
+function exprs_occur_in(exprs, expr)
+    vec(jacobian_sparsity([expr], exprs))
+end
+
 """
 ```julia
 hessian(O, vars::AbstractVector; simplify = true)

src/utils.jl

@@ -119,13 +119,14 @@ end
 
 @deprecate substitute_expr!(expr,s) substitute(expr,s)
 
-function states_to_sym(states)
+function states_to_sym(states::Set)
     function _states_to_sym(O)
         if O isa Equation
             Expr(:(=), _states_to_sym(O.lhs), _states_to_sym(O.rhs))
         elseif O isa Term
             if isa(O.op, Sym)
-                any(isequal(O), states) && return tosymbol(O)  # dependent variables
+                O in states && return tosymbol(O)
+                # dependent variables
                 return build_expr(:call, Any[O.op.name; _states_to_sym.(O.args)])
             else
                 return build_expr(:call, Any[O.op; _states_to_sym.(O.args)])
@@ -137,6 +138,7 @@ function states_to_sym(states)
         end
     end
 end
+states_to_sym(states) = states_to_sym(Set(states))
 
 """
     toparam(s::Sym) -> Sym{<:Parameter}

test/direct.jl

@@ -36,6 +36,11 @@ reference_jac = sparse(ModelingToolkit.jacobian(du, [x,y,z]))
 
 @test findnz(ModelingToolkit.jacobian_sparsity(du, [x,y,z]))[[1,2]] == findnz(reference_jac)[[1,2]]
 
+let
+    @variables t x(t) y(t) z(t)
+    @test ModelingToolkit.exprs_occur_in([x,y,z], x^2*y) == [true, true, false]
+end
+
 @test isequal(ModelingToolkit.sparsejacobian(du, [x,y,z]), reference_jac)
 
 using ModelingToolkit