make the resultant types symengine-free

Author: ChrisRackauckas

src/maketype.jl

@@ -1,42 +1,22 @@
 function maketype(name,param_dict,origex,funcs,syms,fex;
                   pex=:(), vector_ex = :(), vector_ex_return = :(),
-                  symtgrad=Vector{SymEngine.Basic}(0),
                   tgradex = :(),
-                  symjac=Matrix{SymEngine.Basic}(0,0),
                   Jex=:(),
-                  expjac=Matrix{SymEngine.Basic}(0,0),
                   expJex=:(),
-                  invjac=Matrix{SymEngine.Basic}(0,0),
                   invJex=:(),invWex=:(),invWex_t=:(),
-                  symfuncs = Vector{SymEngine.Basic}(0),
-                  symhes   = Matrix{SymEngine.Basic}(0,0),
-                  invhes   = Matrix{SymEngine.Basic}(0,0),
-                  syminvW  = Matrix{SymEngine.Basic}(0,0),
-                  syminvW_t= Matrix{SymEngine.Basic}(0,0),
                   Hex = :(),
                   invHex = :(),
                   params = Symbol[],
                   pfuncs=Vector{Expr}(0),
                   d_pfuncs = Vector{Expr}(0),
-                  param_symjac=Matrix{SymEngine.Basic}(0,0),
                   param_Jex=:())
 
     typeex = :(mutable struct $name <: DiffEqBase.AbstractParameterizedFunction{true}
         origex::Expr
         funcs::Vector{Expr}
-        symfuncs::Vector{SymEngine.Basic}
         pfuncs::Vector{Expr}
         d_pfuncs::Vector{Expr}
         syms::Vector{Symbol}
-        symtgrad::Vector{SymEngine.Basic}
-        symjac::Matrix{SymEngine.Basic}
-        expjac::Matrix{SymEngine.Basic}
-        invjac::Matrix{SymEngine.Basic}
-        syminvW::Matrix{SymEngine.Basic}
-        syminvW_t::Matrix{SymEngine.Basic}
-        symhes::Matrix{SymEngine.Basic}
-        invhes::Matrix{SymEngine.Basic}
-        param_symjac::Matrix{SymEngine.Basic}
         tgradex::Expr
         Jex::Expr
         expJex::Expr
@@ -70,19 +50,9 @@ function maketype(name,param_dict,origex,funcs,syms,fex;
     param_Jex_ex = Meta.quot(param_Jex)
     constructorex = :($(name)(;$(Expr(:kw,:origex,new_ex)),
                   $(Expr(:kw,:funcs,funcs)),
-                  $(Expr(:kw,:symfuncs,symfuncs)),
                   $(Expr(:kw,:pfuncs,pfuncs)),
                   $(Expr(:kw,:d_pfuncs,d_pfuncs)),
                   $(Expr(:kw,:syms,syms)),
-                  $(Expr(:kw,:symtgrad,symtgrad)),
-                  $(Expr(:kw,:symjac,symjac)),
-                  $(Expr(:kw,:expjac,expjac)),
-                  $(Expr(:kw,:invjac,invjac)),
-                  $(Expr(:kw,:syminvW,syminvW)),
-                  $(Expr(:kw,:syminvW_t,syminvW_t)),
-                  $(Expr(:kw,:symhes,symhes)),
-                  $(Expr(:kw,:invhes,invhes)),
-                  $(Expr(:kw,:param_symjac,param_symjac)),
                   $(Expr(:kw,:tgradex,tgradex_ex)),
                   $(Expr(:kw,:Jex,Jex_ex)),
                   $(Expr(:kw,:expJex,expJex_ex)),
@@ -97,9 +67,9 @@ function maketype(name,param_dict,origex,funcs,syms,fex;
                   $(Expr(:kw,:vector_ex,vector_ex_ex)),
                   $(Expr(:kw,:vector_ex_return,vector_ex_return_ex)),
                   $(Expr(:kw,:params,params))) =
-                  $(name)(origex,funcs,symfuncs,pfuncs,d_pfuncs,syms,
-                  symtgrad,symjac,expjac,invjac,syminvW,syminvW_t,symhes,invhes,
-                  param_symjac,tgradex,Jex,expJex,param_Jex,invJex,invWex,invWex_t,
+                  $(name)(origex,funcs,pfuncs,d_pfuncs,syms,
+                  tgradex,Jex,expJex,param_Jex,
+                  invJex,invWex,invWex_t,
                   Hex,invHex,fex,pex,vector_ex,vector_ex_return,params)) |> esc
 
     # Make the type instance using the default constructor

src/ode_def_opts.jl

@@ -236,13 +236,12 @@ function ode_def_opts(name::Symbol,opts::Dict{Symbol,Bool},ex::Expr,params...;_M
 
   typeex,constructorex = maketype(name,params,origex,funcs,syms,fex,pex=pex,
                vector_ex = vector_ex,vector_ex_return = vector_ex_return,
-               symfuncs=symfuncs,symtgrad=symtgrad,tgradex=tgradex,
-               symjac=symjac,Jex=Jex,expjac=expjac,expJex=expJex,invjac=invjac,
-               invWex=invWex,invWex_t=invWex_t,syminvW=syminvW,
-               syminvW_t=syminvW_t,invJex=invJex,symhes=symhes,invhes=invhes,Hex=Hex,
+               tgradex=tgradex,expJex=expJex,Jex=Jex,
+               invWex=invWex,invWex_t=invWex_t,
+               invJex=invJex,Hex=Hex,
                invHex=invHex,params=params,
                pfuncs=pfuncs,d_pfuncs=d_pfuncs,
-               param_symjac=param_symjac,param_Jex=param_Jex)
+               param_Jex=param_Jex)
 
   push!(exprs,typeex)
   push!(exprs,constructorex)

test/runtests.jl

@@ -1,5 +1,5 @@
 using ParameterizedFunctions, DiffEqBase
-using Test
+using Test, LinearAlgebra
 
 using SpecialFunctions