Merge pull request #692 from hexaeder/fix_namespace_expr

namespace_expr should not change type

Author: ChrisRackauckas

src/systems/abstractsystem.jl

@@ -188,11 +188,11 @@ function namespace_expr(O::Sym,name,ivname)
     O.name == ivname ? O : rename(O,renamespace(name,O.name))
 end
 
-function namespace_expr(O::Term,name,ivname)
+function namespace_expr(O::Term{T},name,ivname) where {T}
     if O.op isa Sym
-        Term{Real}(rename(O.op,renamespace(name,O.op.name)),namespace_expr.(O.args,name,ivname))
+        Term{T}(rename(O.op,renamespace(name,O.op.name)),namespace_expr.(O.args,name,ivname))
     else
-        Term{Real}(O.op,namespace_expr.(O.args,name,ivname))
+        Term{T}(O.op,namespace_expr.(O.args,name,ivname))
     end
 end
 namespace_expr(O,name,ivname) = O

test/variable_utils.jl

@@ -11,3 +11,14 @@ expr = (((1 / β - 1) + δ) / α) ^ (1 / (α - 1))
 sol = ModelingToolkit.substitute(expr, s)
 new = (((1 / β - 1) + δ) / γ) ^ (1 / (γ - 1))
 @test iszero(sol - new)
+
+# test namespace_expr
+@parameters t a p(t)
+pterm = p.val
+pnsp = ModelingToolkit.namespace_expr(pterm, :namespace, :t)
+@test typeof(pterm) == typeof(pnsp)
+@test ModelingToolkit.getname(pnsp) == Symbol("namespace₊p")
+asym = a.val
+ansp = ModelingToolkit.namespace_expr(asym, :namespace, :t)
+@test typeof(asym) == typeof(ansp)
+@test ModelingToolkit.getname(ansp) == Symbol("namespace₊a")