allow no parameters

Author: ChrisRackauckas

src/ModelingToolkit.jl

@@ -3,7 +3,7 @@ module ModelingToolkit
 export Operation, Expression
 export calculate_jacobian, generate_jacobian, generate_function
 export independent_variables, dependent_variables, parameters
-export simplified_expr
+export simplified_expr, eval_function
 export @register, @I
 export modelingtoolkitize
 

src/utils.jl

@@ -31,7 +31,7 @@ function flatten_expr!(x)
     x
 end
 
-function build_function(rhss, vs, ps, args = (), conv = simplified_expr; constructor=nothing)
+function build_function(rhss, vs, ps = (), args = (), conv = simplified_expr; constructor=nothing)
     _vs = map(x-> x isa Operation ? x.op : x, vs)
     _ps = map(x-> x isa Operation ? x.op : x, ps)
     var_pairs   = [(u.name, :(u[$i])) for (i, u) ∈ enumerate(_vs)]
@@ -48,12 +48,14 @@ function build_function(rhss, vs, ps, args = (), conv = simplified_expr; constru
 
     sys_expr = build_expr(:tuple, [conv(rhs) for rhs ∈ rhss])
     let_expr = Expr(:let, var_eqs, sys_expr)
+
+    fargs = ps == () ? :(u,$(args...)) : :(u,p,$(args...))
     quote
-        function $fname($X,u,p,$(args...))
+        function $fname($X,$(fargs.args...))
             $ip_let_expr
             nothing
         end
-        function $fname(u,p,$(args...))
+        function $fname($(fargs.args...))
             X = $let_expr
             T = promote_type(map(typeof,X)...)
             convert.(T,X)
@@ -63,7 +65,6 @@ function build_function(rhss, vs, ps, args = (), conv = simplified_expr; constru
     end
 end
 
-
 is_constant(::Constant) = true
 is_constant(::Any) = false
 

test/direct.jl

@@ -2,7 +2,7 @@ using ModelingToolkit, StaticArrays, LinearAlgebra
 using DiffEqBase
 using Test
 
-# Define some variables
+# Calculus
 @parameters t σ ρ β
 @variables x y z
 
@@ -29,14 +29,33 @@ end
 @test all(isequal.(ModelingToolkit.gradient(eqs[1],[x,y,z]),[σ * -1,σ,0]))
 @test all(isequal.(ModelingToolkit.hessian(eqs[1],[x,y,z]),0))
 
+# Function building
+
 @parameters σ() ρ() β()
 @variables x y z
-
 eqs = [σ*(y-x),
        x*(ρ-z)-y,
        x*y - β*z]
+f = eval(ModelingToolkit.build_function(eqs,[x,y,z],[σ,ρ,β]))
+out = [1.0,2,3]
+o1 = f([1.0,2,3],[1.0,2,3])
+f(out,[1.0,2,3],[1.0,2,3])
+@test all(o1 .== out)
 
-ModelingToolkit.build_function(eqs,[x,y,z],[σ,ρ,β])
+function test_worldage()
+   @parameters σ() ρ() β()
+   @variables x y z
+   eqs = [σ*(y-x),
+          x*(ρ-z)-y,
+          x*y - β*z]
+   _f = eval(ModelingToolkit.build_function(eqs,[x,y,z],[σ,ρ,β]))
+   f(u,p) = ModelingToolkit.fast_invokelatest(_f,typeof(u),u,p)
+   f(du,u,p) = ModelingToolkit.fast_invokelatest(_f,Nothing,du,u,p)
+   out = [1.0,2,3]
+   o1 = f([1.0,2,3],[1.0,2,3])
+   f(out,[1.0,2,3],[1.0,2,3])
+end
+test_worldage()
 
 mac = @I begin
    @parameters σ() ρ() β()
@@ -45,17 +64,17 @@ mac = @I begin
    eqs = [σ*(y-x),
           x*(ρ-z)-y,
           x*y - β*z]
-
    ModelingToolkit.build_function(eqs,[x,y,z],[σ,ρ,β])
 end
 f = @ICompile
 out = [1.0,2,3]
-f([1.0,2,3],[1.0,2,3])
+o1 = f([1.0,2,3],[1.0,2,3])
 f(out,[1.0,2,3],[1.0,2,3])
+@test all(o1 .== out)
 
 mac = @I begin
-   @parameters σ() ρ() β()
-   @variables x() y() z()
+   @parameters σ ρ β
+   @variables x y z
 
    eqs = [σ*(y-x),
           x*(ρ-z)-y,
@@ -65,6 +84,44 @@ mac = @I begin
 end
 f = @ICompile
 out = zeros(3,3)
-f([1.0,2,3],[1.0,2,3])
+o1 = f([1.0,2,3],[1.0,2,3])
 f(out,[1.0,2,3],[1.0,2,3])
-out
+@test all(out .== o1)
+
+## No parameters
+@variables x y z
+eqs = [(y-x)^2,
+       x*(x-z)-y,
+       x*y - y*z]
+f = eval(ModelingToolkit.build_function(eqs,[x,y,z]))
+out = zeros(3)
+o1 = f([1.0,2,3])
+f(out,[1.0,2,3])
+@test all(out .== o1)
+
+function test_worldage()
+   @variables x y z
+   eqs = [(y-x)^2,
+          x*(x-z)-y,
+          x*y - y*z]
+   _f = eval(ModelingToolkit.build_function(eqs,[x,y,z]))
+   f(u) = ModelingToolkit.fast_invokelatest(_f,typeof(u),u)
+   f(du,u) = ModelingToolkit.fast_invokelatest(_f,Nothing,du,u)
+   out = zeros(3)
+   o1 = f([1.0,2,3])
+   f(out,[1.0,2,3])
+end
+test_worldage()
+
+mac = @I begin
+   @variables x y z
+   eqs = [(y-x)^2,
+          x*(x-z)-y,
+          x*y - y*z]
+   ModelingToolkit.build_function(eqs,[x,y,z])
+end
+f = @ICompile
+out = zeros(3)
+o1 = f([1.0,2,3])
+f(out,[1.0,2,3])
+@test all(out .== o1)