Merge d6eff50 into 1cabfea

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 @register
+export @register, @mt_setup
 
 
 using DiffEqBase
@@ -39,5 +39,6 @@ include("systems/nonlinear/nonlinear_system.jl")
 include("function_registration.jl")
 include("simplify.jl")
 include("utils.jl")
+include("mt_setup.jl")
 
 end # module

src/mt_setup.jl

@@ -0,0 +1,6 @@
+macro mt_setup(expr)
+    MacroTools.postwalk(expr) do x
+        x == :ODEFunction ? :generate_function : x
+    end
+    expr
+end

test/mt_setup.jl

@@ -0,0 +1,20 @@
+using ModelingToolkit
+using Test
+
+f = @mt_setup begin
+    @parameters t σ ρ β
+    @variables x(t) y(t) z(t)
+    @derivatives D'~t
+
+    eqs = [D(x) ~ σ*(y-x),
+           D(y) ~ x*(ρ-z)-y,
+           D(z) ~ x*y - β*z]
+    de = ODESystem(eqs)
+    ODEFunction(de, [x,y,z], [σ,ρ,β])
+end
+
+du = zeros(3)
+u  = collect(1:3)
+p  = collect(4:6)
+f(du, u, p, 0.1)
+@test du == [4, 0, -16]

test/runtests.jl

@@ -4,3 +4,4 @@ using ModelingToolkit, Test
 @testset "Differentiation Test" begin include("derivatives.jl") end
 @testset "Simplify Test" begin include("simplify.jl") end
 @testset "System Construction Test" begin include("system_construction.jl") end
+@testset "mt_setup Test" begin include("mt_setup.jl") end