symjac and symtgrad

Author: ChrisRackauckas

REQUIRE

@@ -1,4 +1,4 @@
-julia 0.7-beta
+julia 0.7-beta2
 SymEngine 0.2.0
 DataStructures 0.4.6
 DiffEqBase 0.14.0

src/maketype.jl

@@ -7,8 +7,10 @@ function maketype(name,param_dict,origex,funcs,syms,fex;
                   Hex = :(),
                   invHex = :(),
                   params = Symbol[],
-                  pfuncs=Vector{Expr}(0),
-                  d_pfuncs = Vector{Expr}(0),
+                  pfuncs=Vector{Expr}(undef,0),
+                  d_pfuncs = Vector{Expr}(undef,0),
+                  symjac = Matrix{Expr}(undef,0,0),
+                  symtgrad = Vector{Expr}(undef,0),
                   param_Jex=:(),
                   f_expr=:(),
                   tgrad_expr=:(),
@@ -31,6 +33,8 @@ function maketype(name,param_dict,origex,funcs,syms,fex;
         pfuncs::Vector{Expr}
         d_pfuncs::Vector{Expr}
         syms::Vector{Symbol}
+        symjac::Matrix{Any} # https://github.com/symengine/SymEngine.jl/issues/122
+        symtgrad::Vector{Any}
         tgradex::Expr
         Jex::Expr
         expJex::Expr
@@ -85,7 +89,7 @@ function maketype(name,param_dict,origex,funcs,syms,fex;
                   $(Expr(:kw,:params,params))) =
                   $(name)($f_expr,nothing,
                   $jac_expr,$tgrad_expr,$invW_expr,$invW_t_expr,$param_jac_expr,
-                  origex,funcs,pfuncs,d_pfuncs,syms,
+                  origex,funcs,pfuncs,d_pfuncs,syms,$symjac,$symtgrad,
                   tgradex,Jex,expJex,param_Jex,
                   invJex,invWex,invWex_t,
                   Hex,invHex,fex,pex,vector_ex,vector_ex_return,params)) |> esc

src/ode_def_opts.jl

@@ -294,7 +294,9 @@ function ode_def_opts(name::Symbol,opts::Dict{Symbol,Bool},ex::Expr,params...;_M
                invjac_expr=invjac_expr,
                invW_expr=invW_expr,
                invW_t_expr=invW_t_expr,
-               param_jac_expr=param_jac_expr)
+               param_jac_expr=param_jac_expr,
+               symjac = convert.(Expr,symjac),
+               symtgrad = convert.(Expr,symtgrad))
 
   push!(exprs,typeex)
   push!(exprs,constructorex)