Fix ODEFunction

Author: HarrisonGrodin

src/systems/diffeqs/diffeqsystem.jl

@@ -113,11 +113,11 @@ function (f::DiffEqToExpr)(O::Operation)
 end
 (f::DiffEqToExpr)(x) = convert(Expr, x)
 
-function generate_function(sys::ODESystem, vs, ps; version::FunctionVersion = ArrayFunction)
+function generate_function(sys::ODESystem, dvs, ps; version::FunctionVersion = ArrayFunction)
     rhss = [deq.rhs for deq ∈ sys.eqs]
-    vs′ = [clean(v) for v ∈ vs]
+    dvs′ = [clean(dv) for dv ∈ dvs]
     ps′ = [clean(p) for p ∈ ps]
-    return build_function(rhss, vs′, ps′, (sys.iv.name,), DiffEqToExpr(sys); version = version)
+    return build_function(rhss, dvs′, ps′, (sys.iv.name,), DiffEqToExpr(sys); version = version)
 end
 
 
@@ -148,8 +148,8 @@ function generate_ode_iW(sys::ODESystem, simplify=true; version::FunctionVersion
     return (iW_func, iW_t_func)
 end
 
-function DiffEqBase.ODEFunction(sys::ODESystem; version::FunctionVersion = ArrayFunction)
-    expr = generate_function(sys; version = version)
+function DiffEqBase.ODEFunction(sys::ODESystem, dvs, ps; version::FunctionVersion = ArrayFunction)
+    expr = generate_function(sys, dvs, ps; version = version)
     if version === ArrayFunction
         ODEFunction{true}(eval(expr))
     elseif version === SArrayFunction

test/system_construction.jl

@@ -35,9 +35,7 @@ generate_function(de, [x,y,z], [σ,ρ,β])
 generate_function(de, [x,y,z], [σ,ρ,β]; version=ModelingToolkit.SArrayFunction)
 jac_expr = generate_jacobian(de)
 jac = calculate_jacobian(de)
-@test_broken begin
-    f = ODEFunction(de)
-end
+f = ODEFunction(de, [x,y,z], [σ,ρ,β])
 ModelingToolkit.generate_ode_iW(de)
 
 @testset "time-varying parameters" begin
@@ -101,9 +99,7 @@ eqs = [D(x) ~ σ*a,
 de = ODESystem(eqs)
 generate_function(de, [x,y,z], [σ,ρ,β])
 jac = calculate_jacobian(de)
-@test_broken begin
-    f = ODEFunction(de)
-end
+f = ODEFunction(de, [x,y,z], [σ,ρ,β])
 
 # Define a nonlinear system
 eqs = [0 ~ σ*(y-x),