Merge pull request #87 from SciML/shashi-patch-1

bump MTK compat

Author: ChrisRackauckas

Project.toml

@@ -1,7 +1,7 @@
 name = "ParameterizedFunctions"
 uuid = "65888b18-ceab-5e60-b2b9-181511a3b968"
 authors = ["Chris Rackauckas <[email protected]>"]
-version = "5.12.1"
+version = "5.12.2"
 
 [deps]
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
@@ -18,7 +18,7 @@ DataStructures = "0.17, 0.18"
 DiffEqBase = "6.5"
 DocStringExtensions = "0.8"
 Latexify = "0.14, 0.15"
-ModelingToolkit = "6"
+ModelingToolkit = "7"
 Reexport = "0.2, 1.0"
 SciMLBase = "1.3"
 julia = "1.3"

src/utils.jl

@@ -22,8 +22,7 @@ function modelingtoolkitize_expr(ex::Expr,vars,curmod)
     ex.head === :if && (ex = Expr(:call, ifelse, ex.args...))
     ex.head === :call || throw(ArgumentError("internal representation does not support non-call Expr"))
     op = ex.args[1] ∈ names ? vars[findfirst(x->ex.args[1] == tosymbol(x),vars)] : getproperty(curmod,ex.args[1]) # HACK
-    args = [modelingtoolkitize_expr(x,vars,curmod) for x in ex.args[2:end]]
-    return Term(op, args)
+    return op((modelingtoolkitize_expr(x,vars,curmod) for x in ex.args[2:end])...)
 end
 
 function modelingtoolkitize_expr(ex::Sym,vars,curmod)

test/runtests.jl

@@ -85,8 +85,7 @@ end a μ c d
 NJ(du,u,[1.5,1,3,4],t)
 @test du == [-3.0;-3*3.0 + erf(2.0*3.0/4)]
 @test du == NJ(u,[1.5,1,3,4],t)
-@test_throws MethodError NJ.jac(iJ,u,p,t)
-# NJ(Val{:jac},t,u,J) # Currently gives E not defined, will be fixed by the next SymEgine
+NJ.jac(iJ,u,p,t)
 
 println("Test anonymous definition")