finish rename

Author: ChrisRackauckas

src/ModelingToolkit.jl

@@ -81,6 +81,18 @@ include("variables.jl")
 include("context_dsl.jl")
 include("operations.jl")
 include("differentials.jl")
+
+function Base.convert(::Type{Variable},x::Operation)
+    if x.op isa Variable
+        x.op
+    elseif x.op isa Differential
+        var = x.args[1].op
+        rename(var,Symbol(var.name,:ˍ,x.args[1].args[1].op.name))
+    else
+        throw(error("This Operation is not a Variable"))
+    end
+end
+
 include("equations.jl")
 include("function_registration.jl")
 include("simplify.jl")

src/operations.jl

@@ -66,9 +66,6 @@ Operation(x) = convert(Operation, x)
 #convert to Expr
 Base.Expr(op::Operation) = simplified_expr(op)
 Base.convert(::Type{Expr},x::Operation) = Expr(x)
-function Base.convert(::Type{Variable},x::Operation)
-    x.op isa Variable ? x.op : throw(error("This Operation is not a Variable"))
-end
 
 # promotion
 Base.promote_rule(::Type{<:Constant}, ::Type{<:Operation}) = Operation

src/systems/abstractsystem.jl

@@ -25,7 +25,7 @@ function Base.getproperty(sys::AbstractSystem, name::Symbol)
     throw(error("Variable $name does not exist"))
 end
 
-renamespace(namespace,name) = Symbol(string(namespace)*"₊"*string(name))
+renamespace(namespace,name) = Symbol(namespace,:₊,name)
 
 function namespace_variables(sys::AbstractSystem)
     [rename(x,renamespace(sys.name,x.name)) for x in states(sys)]
@@ -62,22 +62,24 @@ end
 
 function states(sys::AbstractSystem,name::Symbol)
     x = sys.states[findfirst(x->x.name==name,sys.states)]
-    Variable(Symbol(string(sys.name)*"₊"*string(x.name)))(sys.iv())
+    rename(x,renamespace(sys.name,x.name))(sys.iv())
 end
 
 function parameters(sys::AbstractSystem,name::Symbol)
     x = sys.ps[findfirst(x->x.name==name,sys.ps)]
-    Variable(Symbol(string(sys.name)*"₊"*string(x.name)))(sys.iv())
+    rename(x,renamespace(sys.name,x.name))()
 end
 
 function states(sys::AbstractSystem,args...)
     name = last(args)
-    extra_names = reduce(*,["₊$(x.name)" for x in args[1:end-1]])
-    Variable(Symbol(string(sys.name)*extra_names*"₊"*string(name)))(sys.iv())
+    extra_names = reduce(Symbol,[Symbol(:₊,x.name) for x in args[1:end-1]])
+    newname = renamespace(extra_names,name)
+    rename(x,renamespace(sys.name,newname))(sys.iv())
 end
 
 function parameters(sys::AbstractSystem,args...)
     name = last(args)
-    extra_names = reduce(*,["₊$(x.name)" for x in args[1:end-1]])
-    Variable(Symbol(string(sys.name)*extra_names*"₊"*string(name)))(sys.iv())
+    extra_names = reduce(Symbol,[Symbol(:₊,x.name) for x in args[1:end-1]])
+    newname = renamespace(extra_names,name)
+    rename(x,renamespace(sys.name,newname))()
 end

test/odesystem.jl

@@ -123,25 +123,25 @@ end
 # Conversion to first-order ODEs #17
 @derivatives D3'''~t
 @derivatives D2''~t
-@variables u(t) u_tt(t) u_t(t) x_t(t)
+@variables u(t) uˍtt(t) uˍt(t) xˍt(t)
 eqs = [D3(u) ~ 2(D2(u)) + D(u) + D(x) + 1
        D2(x) ~ D(x) + 2]
 de = ODESystem(eqs)
 de1 = ode_order_lowering(de)
-lowered_eqs = [D(u_tt) ~ 2u_tt + u_t + x_t + 1
-               D(x_t)  ~ x_t + 2
-               D(u_t)  ~ u_tt
-               D(u)    ~ u_t
-               D(x)    ~ x_t]
+lowered_eqs = [D(uˍtt) ~ 2uˍtt + uˍt + xˍt + 1
+               D(xˍt)  ~ xˍt + 2
+               D(uˍt)  ~ uˍtt
+               D(u)    ~ uˍt
+               D(x)    ~ xˍt]
 
 @test de1 == ODESystem(lowered_eqs)
 
 # issue #219
 @test de1.states == [ModelingToolkit.var_from_nested_derivative(eq.lhs)[1] for eq in de1.eqs] == ODESystem(lowered_eqs).states
 
-test_diffeq_inference("first-order transform", de1, t, [u_tt, x_t, u_t, u, x], [])
+test_diffeq_inference("first-order transform", de1, t, [uˍtt, xˍt, uˍt, u, x], [])
 du = zeros(5)
-ODEFunction(de1, [u_tt, x_t, u_t, u, x], [])(du, ones(5), nothing, 0.1)
+ODEFunction(de1, [uˍtt, xˍt, uˍt, u, x], [])(du, ones(5), nothing, 0.1)
 @test du == [5.0, 3.0, 1.0, 1.0, 1.0]
 
 # Internal calculations