Change namespacing implementation (#1183)

Author: YingboMa

Project.toml

@@ -1,7 +1,7 @@
 name = "ModelingToolkit"
 uuid = "961ee093-0014-501f-94e3-6117800e7a78"
 authors = ["Chris Rackauckas <[email protected]>"]
-version = "6.0.0"
+version = "6.1.0"
 
 [deps]
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
@@ -73,7 +73,7 @@ Setfield = "0.7"
 SpecialFunctions = "0.7, 0.8, 0.9, 0.10, 1.0"
 StaticArrays = "0.10, 0.11, 0.12, 1.0"
 SymbolicUtils = "0.12, 0.13"
-Symbolics = "2.0"
+Symbolics = "3.0"
 UnPack = "0.1, 1.0"
 Unitful = "1.1"
 julia = "1.2"

src/systems/abstractsystem.jl

@@ -216,10 +216,6 @@ Setfield.get(obj::AbstractSystem, ::Setfield.PropertyLens{field}) where {field}
 end
 
 rename(x::AbstractSystem, name) = @set x.name = name
-function rename(xx::Symbolics.ArrayOp, name)
-    @set! xx.expr.f.arguments[1] = rename(xx.expr.f.arguments[1], name)
-    @set! xx.term.arguments[2] = rename(xx.term.arguments[2], name)
-end
 
 function Base.propertynames(sys::AbstractSystem; private=false)
     if private
@@ -324,37 +320,20 @@ GlobalScope(sym::Union{Num, Symbolic}) = setmetadata(sym, SymScope, GlobalScope(
 
 renamespace(sys, eq::Equation) = namespace_equation(eq, sys)
 
-function _renamespace(sys, x)
-    v = unwrap(x)
-
-    if istree(v) && symtype(operation(v)) <: FnType
-        ov = metadata(operation(v), metadata(v))
-        return similarterm(v, renamespace(sys, ov), arguments(v), symtype(v), metadata=metadata(v))
-    end
-
-    if v isa Namespace
-        sysp, v = v.parent, v.named
-        sysn = Symbol(getname(sys), :., getname(sysp))
-        sys = sys isa AbstractSystem ? rename(sysp, sysn) : sysn
-    end
-
-    Namespace(sys, v)
-end
-
 function renamespace(sys, x)
     x = unwrap(x)
     if x isa Symbolic
         let scope = getmetadata(x, SymScope, LocalScope())
             if scope isa LocalScope
-                _renamespace(sys, x)
+                rename(x, renamespace(getname(sys), getname(x)))
             elseif scope isa ParentScope
                 setmetadata(x, SymScope, scope.parent)
             else # GlobalScope
                 x
             end
         end
     else
-        Symbol(getname(sys), :., x)
+        Symbol(getname(sys), :₊, x)
     end
 end
 

test/serialization.jl

@@ -25,4 +25,4 @@ io = IOBuffer()
 write(io, rc_model)
 str = String(take!(io))
 sys = include_string(@__MODULE__, str)
-@test_broken sys == flatten(rc_model) # this actually kind of works, but the variables would have different identities.
+@test sys == flatten(rc_model) # this actually kind of works, but the variables would have different identities.

test/variable_scope.jl

@@ -27,18 +27,18 @@ eqs = [
 
 names = ModelingToolkit.getname.(states(sys))
 @test :d in names
-@test Symbol("sub1.c") in names
-@test Symbol("sub1.sub2.b") in names
-@test Symbol("sub1.sub2.sub3.a") in names
-@test Symbol("sub1.sub2.sub4.a") in names
+@test Symbol("sub1₊c") in names
+@test Symbol("sub1₊sub2₊b") in names
+@test Symbol("sub1₊sub2₊sub3₊a") in names
+@test Symbol("sub1₊sub2₊sub4₊a") in names
 
 @named foo = NonlinearSystem(eqs, [a, b, c, d], [])
 @named bar = NonlinearSystem(eqs, [a, b, c, d], [])
-@test ModelingToolkit.getname(ModelingToolkit.namespace_expr(ModelingToolkit.namespace_expr(b, foo), bar)) == Symbol("bar.b")
+@test ModelingToolkit.getname(ModelingToolkit.namespace_expr(ModelingToolkit.namespace_expr(b, foo), bar)) == Symbol("bar₊b")
 
 renamed(nss, sym) = ModelingToolkit.getname(foldr(ModelingToolkit.renamespace, nss, init=sym))
 
-@test renamed([:foo :bar :baz], a) == Symbol("foo.bar.baz.a")
-@test renamed([:foo :bar :baz], b) == Symbol("foo.bar.b")
-@test renamed([:foo :bar :baz], c) == Symbol("foo.c")
+@test renamed([:foo :bar :baz], a) == Symbol("foo₊bar₊baz₊a")
+@test renamed([:foo :bar :baz], b) == Symbol("foo₊bar₊b")
+@test renamed([:foo :bar :baz], c) == Symbol("foo₊c")
 @test renamed([:foo :bar :baz], d) == :d