restructure macro choices

Author: ChrisRackauckas

README.md

@@ -109,9 +109,8 @@ to be more specific about what to not calculate. In increasing order of calculat
 
 ```julia
 @ode_def_bare
-@ode_def_noinvjac
-@ode_def_noinvhes
-@ode_def_nohes
+@ode_def
+@ode_def_all
 ```
 
 ### Extra Functions

src/ParameterizedFunctions.jl

@@ -33,9 +33,7 @@ module ParameterizedFunctions
   include("macros.jl")
   include("utils.jl")
 
-  export @ode_def, @fem_def, ode_def_opts,@ode_def_bare, @ode_def_nohes,
-         @ode_def_noinvjac, @ode_def_noinvhes,@ode_def_noinvjac
-
+  export @ode_def,ode_def_opts,@ode_def_bare, @ode_def_all
 end # module
 
 

src/macros.jl

@@ -4,7 +4,7 @@ macro ode_def(name,ex,params...)
     :build_jac => true,
     :build_expjac => false,
     :build_invjac => false,
-    :build_invW => true,
+    :build_invW => false,
     :build_hes => false,
     :build_invhes => false,
     :build_dpfuncs => true)
@@ -26,21 +26,7 @@ macro ode_def_bare(name,ex,params...)
         ode_def_opts(name,opts,ex,params...)
 end
 
-macro ode_def_nohes(name,ex,params...)
-  opts = Dict{Symbol,Bool}(
-  :build_tgrad => true,
-  :build_jac => true,
-  :build_expjac => false,
-  :build_invjac => false,
-  :build_invW => true,
-  :build_hes => false,
-  :build_invhes => false,
-  :build_dpfuncs => true)
-  name isa Expr ? ode_def_opts(gensym(),opts,name,ex,params...) :
-    ode_def_opts(name,opts,ex,params...)
-end
-
-macro ode_def_noinvhes(name,ex,params...)
+macro ode_def_all(name,ex,params...)
     opts = Dict{Symbol,Bool}(
     :build_tgrad => true,
     :build_jac => true,
@@ -53,17 +39,3 @@ macro ode_def_noinvhes(name,ex,params...)
     name isa Expr ? ode_def_opts(gensym(),opts,name,ex,params...) :
         ode_def_opts(name,opts,ex,params...)
 end
-
-macro ode_def_noinvjac(name,ex,params...)
-    opts = Dict{Symbol,Bool}(
-    :build_tgrad => true,
-    :build_jac => true,
-    :build_expjac => false,
-    :build_invjac => false,
-    :build_invW => false,
-    :build_hes => false,
-    :build_invhes => false,
-    :build_dpfuncs => true)
-    name isa Expr ? ode_def_opts(gensym(),opts,name,ex,params...) :
-        ode_def_opts(name,opts,ex,params...)
-end

test/runtests.jl

@@ -13,22 +13,22 @@ end a b c d
 
 @test DiffEqBase.__has_syms(f_t)
 
-f_t2 = @ode_def_noinvjac SymCheck2 begin # Checks for error due to symbol on 1
+f_t2 = @ode_def SymCheck2 begin # Checks for error due to symbol on 1
   dx = 1
   dy = -c*y + d*x*y*t^2
 end a b c d
 
-f_t3 = @ode_def_noinvjac ExprCheck begin # Checks for error due to symbol on 1
+f_t3 = @ode_def ExprCheck begin # Checks for error due to symbol on 1
   dx = a*x - b*x*y
   dy = -c*y + d*x*y
 end a b c d # Change to π after unicode fix
 
-f = @ode_def LotkaVolterra begin
+f = @ode_def_all LotkaVolterra begin
   dx = a*x - b*x*y
   dy = -c*y + d*x*y
 end a b c d
 
-f_2 = @ode_def_nohes LotkaVolterra3 begin
+f_2 = @ode_def LotkaVolterra3 begin
   dx = a*x - b^2*x*y
   dy = -c*y + d*x*y
 end a b c d
@@ -84,7 +84,7 @@ println("Test booleans")
 @code_llvm DiffEqBase.has_paramjac(f)
 
 println("Test difficult differentiable")
-NJ = @ode_def_nohes DiffDiff begin
+NJ = @ode_def DiffDiff begin
   dx = a*x - b*x*y
   dy = -c*y + erf(x*y/d)
 end a b c d