ParameterizedFunction type

Author: ChrisRackauckas

src/ParameterizedFunctions.jl

@@ -29,11 +29,14 @@ module ParameterizedFunctions
   include("dict_build.jl")
   include("fem.jl")
   include("macros.jl")
+  include("parameterized_function_type.jl")
 
   export @ode_def, @fem_def, ode_def_opts,
          @ode_def_bare, @ode_def_nohes, @ode_def_noinvjac, @ode_def_noinvhes,
          @ode_def_mm, @ode_def_nohes_mm, @ode_def_noinvjac, @ode_def_noinvhes_mm
 
+  export ParameterizedFunction
+
 end # module
 
 

src/parameterized_function_type.jl

@@ -0,0 +1,14 @@
+type ParameterizedFunction{isinplace,F,P} <: AbstractParameterizedFunction{isinplace}
+  f::F
+  p::P
+end
+
+function ParameterizedFunction(f,p)
+  isinplace = numparameters(f)>=4
+  ParameterizedFunction{isinplace,typeof(f),typeof(p)}(f,p)
+end
+
+(pf::ParameterizedFunction{true,F,P}){F,P}(t,u,du) = pf.f(t,u,pf.p,du)
+(pf::ParameterizedFunction{true,F,P}){F,P}(t,u,params,du) = pf.f(t,u,params,du)
+(pf::ParameterizedFunction{false,F,P}){F,P}(t,u) = pf.f(t,u,pf.p)
+(pf::ParameterizedFunction{false,F,P}){F,P}(t,u,params) = pf.f(t,u,params)

test/runtests.jl

@@ -36,6 +36,19 @@ end
          du[2] = -3 * u[2] + u[1]*u[2]
 end
 
+pf_func = function (t,u,p,du)
+  du[1] = p[1] * u[1] - p[2] * u[1]*u[2]
+  du[2] = -3 * u[2] + u[1]*u[2]
+end
+
+pf = ParameterizedFunction(pf_func,[1.5,1.0])
+
+pf_func2 = function (t,u,p)
+  [p[1] * u[1] - p[2] * u[1]*u[2];-3 * u[2] + u[1]*u[2]]
+end
+
+pf2 = ParameterizedFunction(pf_func2,[1.5,1.0])
+
 println("Test Values")
 t = 1.0
 u = [2.0,3.0]
@@ -46,6 +59,9 @@ iJ= zeros(2,2)
 iW= zeros(2,2)
 f(t,u,du)
 @test du == [-3.0,-3.0]
+pf(t,u,du)
+@test du == [-3.0,-3.0]
+@test pf2(t,u) == [-3.0,-3.0]
 
 println("Test t-gradient")
 f(Val{:tgrad},t,u,grad)