Merge pull request #1135 from SciML/myb/fix

Check names in equality check between systems

Author: YingboMa

docs/Project.toml

@@ -1,6 +1,6 @@
 [deps]
-ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
+ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
 
 [compat]
 Documenter = "0.27"

src/systems/abstractsystem.jl

@@ -513,6 +513,7 @@ function toexpr(sys::AbstractSystem)
     expr = Expr(:block)
     stmt = expr.args
 
+    name = Meta.quot(nameof(sys))
     iv = independent_variable(sys)
     ivname = gensym(:iv)
     if iv !== nothing
@@ -535,9 +536,9 @@ function toexpr(sys::AbstractSystem)
     defs_name = push_defaults!(stmt, defaults(sys), var2name)
 
     if sys isa ODESystem
-        push!(stmt, :($ODESystem($eqs_name, $ivname, $stsname, $psname; defaults=$defs_name)))
+        push!(stmt, :($ODESystem($eqs_name, $ivname, $stsname, $psname; defaults=$defs_name, name=$name)))
     elseif sys isa NonlinearSystem
-        push!(stmt, :($NonlinearSystem($eqs_name, $stsname, $psname; defaults=$defs_name)))
+        push!(stmt, :($NonlinearSystem($eqs_name, $stsname, $psname; defaults=$defs_name, name=$name)))
     end
 
     striplines(expr) # keeping the line numbers is never helpful

src/systems/diffeqs/odesystem.jl

@@ -180,6 +180,7 @@ function Base.:(==)(sys1::ODESystem, sys2::ODESystem)
     iv1 = independent_variable(sys1)
     iv2 = independent_variable(sys2)
     isequal(iv1, iv2) &&
+    isequal(nameof(sys1), nameof(sys2)) &&
     _eq_unordered(get_eqs(sys1), get_eqs(sys2)) &&
     _eq_unordered(get_states(sys1), get_states(sys2)) &&
     _eq_unordered(get_ps(sys1), get_ps(sys2)) &&

src/systems/nonlinear/nonlinearsystem.jl

@@ -328,6 +328,7 @@ function flatten(sys::NonlinearSystem)
 end
 
 function Base.:(==)(sys1::NonlinearSystem, sys2::NonlinearSystem)
+    isequal(nameof(sys1), nameof(sys2)) &&
     _eq_unordered(get_eqs(sys1), get_eqs(sys2)) &&
     _eq_unordered(get_states(sys1), get_states(sys2)) &&
     _eq_unordered(get_ps(sys1), get_ps(sys2)) &&

test/odesystem.jl

@@ -17,7 +17,7 @@ eqs = [D(x) ~ σ*(y-x),
        D(z) ~ x*y - β*z]
 
 ModelingToolkit.toexpr.(eqs)[1]
-de = ODESystem(eqs; defaults=Dict(x => 1))
+@named de = ODESystem(eqs; defaults=Dict(x => 1))
 @test eval(toexpr(de)) == de
 
 generate_function(de)
@@ -389,17 +389,17 @@ let
 end
 
 # Array vars
-using Symbolics: unwrap
+using Symbolics: unwrap, wrap
 using LinearAlgebra
 @variables t
 sts = @variables x[1:3](t) y(t)
-ps = @parameters p[1:3]
+ps = @parameters p[1:3] = [1, 2, 3]
 D = Differential(t)
 eqs = [
-       collect(D(x) ~ x)
+       collect(D.(x) ~ x)
        D(y) ~ norm(x)*y
       ]
-sys = ODESystem(eqs, t, [sts...;], [ps...;])
+@named sys = ODESystem(eqs, t, [sts...;], [ps...;])
 @test isequal(@nonamespace(sys.x), unwrap(x))
 @test isequal(@nonamespace(sys.y), unwrap(y))
 @test isequal(@nonamespace(sys.p), unwrap(p))

test/structural_transformation/index_reduction.jl

@@ -20,7 +20,7 @@ lowered_eqs = [D(xˍt) ~ T*x,
                D(x) ~ xˍt,
                D(y) ~ yˍt,
                0 ~ x^2 + y^2 - L^2,]
-@test ODESystem(lowered_eqs, t, [xˍt, yˍt, x, y, T], [L, g]) == lowered_sys
+@test ODESystem(lowered_eqs, t, [xˍt, yˍt, x, y, T], [L, g], name=:pendulum) == lowered_sys
 @test isequal(equations(lowered_sys), lowered_eqs)
 
 # Simple pendulum in cartesian coordinates