robust isparameter

Author: shashi

src/parameters.jl

@@ -1,9 +1,19 @@
-import SymbolicUtils: symtype, term, hasmetadata
+import SymbolicUtils: symtype, term, hasmetadata, issym
 struct MTKParameterCtx end
 
-isparameter(x::Num) = isparameter(value(x))
-isparameter(x::Symbolic) = getmetadata(x, MTKParameterCtx, false)
-isparameter(x) = false
+function isparameter(x)
+    x = unwrap(x)
+    if istree(x) && operation(x) isa Symbolic
+        getmetadata(x, MTKParameterCtx, false) ||
+        isparameter(operation(x))
+    elseif istree(x) && operation(x) == (getindex)
+        isparameter(arguments(x)[1])
+    elseif x isa Symbolic
+        getmetadata(x, MTKParameterCtx, false)
+    else
+        false
+    end
+end
 
 """
     toparam(s::Sym)
@@ -15,13 +25,11 @@ function toparam(s)
         Symbolics.wrap(toparam(Symbolics.unwrap(s)))
     elseif s isa AbstractArray
         map(toparam, s)
-    elseif symtype(s) <: AbstractArray
-        Symbolics.recurse_and_apply(toparam, s)
     else
         setmetadata(s, MTKParameterCtx, true)
     end
 end
-toparam(s::Num) = Num(toparam(value(s)))
+toparam(s::Num) = wrap(toparam(value(s)))
 
 """
     tovar(s::Sym)

test/variable_parsing.jl

@@ -49,7 +49,7 @@ end
 
 @test all(ModelingToolkit.isparameter, collect(t))
 @test all(ModelingToolkit.isparameter, collect(s))
-@test all(ModelingToolkit.isparameter, Any[σ[1], σ[2]])
+@test all(ModelingToolkit.isparameter, Any[σ(t)[1], σ(t)[2]])
 
 # fntype(n, T) = FnType{NTuple{n, Any}, T}
 # t1 = Num[Variable{Real}(:t, 1), Variable{Real}(:t, 2)]