up

Author: vyudu

src/systems/diffeqs/sdesystem.jl

@@ -273,7 +273,7 @@ function SDESystem(sys::ODESystem, neqs; kwargs...)
     SDESystem(equations(sys), neqs, get_iv(sys), unknowns(sys), parameters(sys); kwargs...)
 end
 
-function SDESystem(eqs, noiseeqs, iv; kwargs...) 
+function SDESystem(eqs::Vector{Equation}, noiseeqs::AbstractArray, iv; kwargs...) 
     param_deps = get(kwargs, :parameter_dependencies, Equation[])
     eqs, dvs, ps = process_equations_DESystem(eqs, param_deps, iv)
 
@@ -288,6 +288,9 @@ function SDESystem(eqs, noiseeqs, iv; kwargs...)
     return SDESystem(eqs, noiseeqs, iv, dvs, [ps; collect(noiseps)]; kwargs...)
 end
 
+SDESystem(eq::Equation, noiseeqs::AbstractArray, args...; kwargs...) = SDESystem([eq], noiseeqs, args...; kwargs...)
+SDESystem(eq::Equation, noiseeq, args...; kwargs...) = SDESystem([eq], [noiseeq], args...; kwargs...)
+
 function Base.:(==)(sys1::SDESystem, sys2::SDESystem)
     sys1 === sys2 && return true
     iv1 = get_iv(sys1)

src/utils.jl

@@ -1225,7 +1225,7 @@ function process_equations_DESystem(eqs, param_deps, iv)
                     throw(ArgumentError("An ODESystem can only have one independent variable."))
                 diffvar in diffvars &&
                     throw(ArgumentError("The differential variable $diffvar is not unique in the system of equations."))
-                !(symtype(diffvar) === Real || eltype(symtype(diffvar)) === Real) && throw(ArgumentError("Differential variable $var has type $(symtype(diffvar)). Differential variables should not be concretely typed."))
+                !(symtype(diffvar) === Real || eltype(symtype(diffvar)) === Real) && throw(ArgumentError("Differential variable $diffvar has type $(symtype(diffvar)). Differential variables should not be concretely typed."))
                 push!(diffvars, diffvar)
             end
             push!(diffeq, eq)

test/odesystem.jl

@@ -1548,7 +1548,10 @@ end
     @parameters p d
     @variables X(t)::Int64
     eq = D(X) ~ p - d*X
-    @test_throws Exception @mtkbuild osys = ODESystem([eq], t)
+    @test_throws ArgumentError @mtkbuild osys = ODESystem([eq], t)
+    @variables Y(t)[1:3]::String
+    eq = D(Y) ~ [p, p, p]
+    @test_throws ArgumentError @mtkbuild osys = ODESystem([eq], t)
 end
 
 # Test `isequal`

test/sdesystem.jl

@@ -875,7 +875,9 @@ end
     @variables X(t)::Int64
     @brownian z
     eq2 = D(X) ~ p - d*X + z
-    @test_throws Exception @mtkbuild ssys = System([eq2], t)
+    @test_throws ArgumentError @mtkbuild ssys = System([eq2], t)
+    noiseeq = [1]
+    @test_throws ArgumentError @named ssys = SDESystem([eq2], [noiseeq], t)
 end
 
 @testset "SDEFunctionExpr" begin