fix and test LabelledArrays in OOP

Author: ChrisRackauckas

Project.toml

@@ -12,6 +12,7 @@ DiffRules = "b552c78f-8df3-52c6-915a-8e097449b14b"
 Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
 GeneralizedGenerated = "6b9d7cbe-bcb9-11e9-073f-15a7a543e2eb"
+LabelledArrays = "2ee39098-c373-598a-b85f-a56591580800"
 Latexify = "23fbe1c1-3f47-55db-b15f-69d7ec21a316"
 LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

src/ModelingToolkit.jl

@@ -1,7 +1,7 @@
 module ModelingToolkit
 
 using DiffEqBase, Distributed
-using StaticArrays, LinearAlgebra, SparseArrays
+using StaticArrays, LinearAlgebra, SparseArrays, LabelledArrays
 using Latexify, Unitful, ArrayInterface
 using MacroTools
 using UnPack: @unpack

src/build_function.jl

@@ -331,8 +331,8 @@ function _build_function(target::JuliaTarget, rhss, args...;
         arr_sys_expr = build_expr(:vect, [conv(rhs) for rhs ∈ rhss])
     end
 
-	arr_sys_expr = !(typeof(rhss) <: SparseMatrixCSC || eltype(rhss) <: Number) ? quote
-		convert(typeof($(fargs.args[1])),if typeof($(fargs.args[1])) <: Union{SArray,SLArray}
+	arr_sys_expr = !(typeof(rhss) <: SparseMatrixCSC || eltype(rhss) <: AbstractArray) ? quote
+		convert(typeof($(fargs.args[1])),if typeof($(fargs.args[1])) <: Union{StaticArrays.SArray,ModelingToolkit.LabelledArrays.SLArray}
 			@SArray $arr_sys_expr
 		else
 			$arr_sys_expr

test/labelledarrays.jl

@@ -0,0 +1,26 @@
+using ModelingToolkit, StaticArrays, LinearAlgebra, LabelledArrays
+using DiffEqBase
+using Test
+
+# Define some variables
+@parameters t σ ρ β
+@variables x(t) y(t) z(t)
+@derivatives D'~t
+
+# Define a differential equation
+eqs = [D(x) ~ σ*(y-x),
+       D(y) ~ x*(ρ-z)-y,
+       D(z) ~ x*y - β*z]
+
+de = ODESystem(eqs)
+f = ODEFunction(de, [x,y,z], [σ,ρ,β])
+
+a = @SVector [1.0,2.0,3.0]
+b = SLVector(x=1.0,y=2.0,z=3.0)
+c = [1.0,2.0,3.0]
+p = SLVector(σ=10.0,ρ=26.0,β=8/3)
+@test f(a,p,0.0) isa SVector
+@test typeof(f(b,p,0.0)) <: SLArray
+@test f(c,p,0.0) isa Vector
+@test f(a,p,0.0) == f(b,p,0.0)
+@test f(a,p,0.0) == f(c,p,0.0)

test/runtests.jl

@@ -7,6 +7,7 @@ using SafeTestsets, Test
 @safetestset "Direct Usage Test" begin include("direct.jl") end
 @safetestset "Build Function Test" begin include("build_function.jl") end
 @safetestset "ODESystem Test" begin include("odesystem.jl") end
+@safetestset "LabelledArrays Test" begin include("labelledarrays.jl") end
 @safetestset "Mass Matrix Test" begin include("mass_matrix.jl") end
 @safetestset "SteadyStateSystem Test" begin include("steadystatesystems.jl") end
 @safetestset "SDESystem Test" begin include("sdesystem.jl") end