Merge pull request #719 from SciML/myb/eqs

Make sure equations returns Vector{Equation}

Author: YingboMa

Project.toml

@@ -1,7 +1,7 @@
 name = "ModelingToolkit"
 uuid = "961ee093-0014-501f-94e3-6117800e7a78"
 authors = ["Chris Rackauckas <[email protected]>"]
-version = "4.5.0"
+version = "4.5.1"
 
 [deps]
 ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"

src/systems/abstractsystem.jl

@@ -176,7 +176,11 @@ function namespace_pins(sys::AbstractSystem)
     [renamespace(sys.name,x) for x in pins(sys)]
 end
 
-namespace_equations(sys::AbstractSystem) = namespace_equation.(equations(sys),sys.name,sys.iv.name)
+function namespace_equations(sys::AbstractSystem)
+    eqs = equations(sys)
+    isempty(eqs) && return Equation[]
+    map(eq->namespace_equation(eq,sys.name,sys.iv.name), eqs)
+end
 
 function namespace_equation(eq::Equation,name,ivname)
     _lhs = namespace_expr(eq.lhs,name,ivname)
@@ -236,11 +240,10 @@ function equations(sys::ModelingToolkit.AbstractSystem)
     if isempty(sys.systems)
         return sys.eqs
     else
-        eqs = [sys.eqs;
+        eqs = Equation[sys.eqs;
                reduce(vcat,
                       namespace_equations.(sys.systems);
                       init=Equation[])]
-
         return eqs
     end
 end

src/systems/reduction.jl

@@ -1,4 +1,4 @@
-export alias_elimination
+export alias_elimination, flatten
 
 function flatten(sys::ODESystem)
     if isempty(sys.systems)

test/reduction.jl

@@ -109,8 +109,28 @@ let
         x ~ y
     ];
     sys = ODESystem(eqs, t, [x], []);
-    asys = alias_elimination(ModelingToolkit.flatten(sys))
+    asys = alias_elimination(flatten(sys))
 
     test_equal.(asys.eqs, [D(x) ~ 2x])
     test_equal.(asys.observed, [y ~ x])
 end
+
+# issue #716
+let
+    @parameters t
+    @derivatives D'~t
+    @variables x(t), u(t), y(t)
+    @parameters a, b, c, d
+    ol = ODESystem([D(x) ~ a * x + b * u, y ~ c * x], t, name=:ol)
+    @variables u_c(t), y_c(t)
+    @parameters k_P
+    pc = ODESystem(Equation[], t, pins=[y_c], observed = [u_c ~ k_P * y_c], name=:pc)
+    connections = [
+                   ol.u ~ pc.u_c,
+                   y_c ~ ol.y
+                  ]
+    connected = ODESystem(connections, t, systems=[ol, pc])
+
+    @test equations(connected) isa Vector{Equation}
+    @test_nowarn flatten(connected)
+end