fix: fix subexpressions_not_involving_vars! handling of array hack

Author: AayushSabharwal

src/utils.jl

@@ -1117,6 +1117,23 @@ function subexpressions_not_involving_vars!(expr, vars, state::Dict{Any, Any})
     symtype(expr) <: Union{Real, AbstractArray{<:Real}} || return expr
     Symbolics.shape(expr) == Symbolics.Unknown() && return expr
     haskey(state, expr) && return state[expr]
+
+    op = operation(expr)
+    args = arguments(expr)
+    if op == StructuralTransformations.change_origin
+        newargs = map(args) do arg
+            if symbolic_type(arg) == NotSymbolic()
+                if is_array_of_symbolics(arg)
+                    return map(arg) do _arg
+                        subexpressions_not_involving_vars!(_arg, vars, state)
+                    end
+                end
+                return arg
+            end
+            subexpressions_not_involving_vars!(arg, vars, state)
+        end
+        return maketerm(typeof(expr), op, newargs, metadata(expr))
+    end
     vs = ModelingToolkit.vars(expr)
     intersect!(vs, vars)
     if isempty(vs)
@@ -1126,8 +1143,6 @@ function subexpressions_not_involving_vars!(expr, vars, state::Dict{Any, Any})
         state[expr] = var
         return var
     end
-    op = operation(expr)
-    args = arguments(expr)
     if (op == (+) || op == (*)) && symbolic_type(expr) !== ArraySymbolic()
         indep_args = []
         dep_args = []
@@ -1146,7 +1161,14 @@ function subexpressions_not_involving_vars!(expr, vars, state::Dict{Any, Any})
         return op(indep_term, dep_term)
     end
     newargs = map(args) do arg
-        symbolic_type(arg) != NotSymbolic() || is_array_of_symbolics(arg) || return arg
+        if symbolic_type(arg) == NotSymbolic()
+            if is_array_of_symbolics(arg)
+                return map(arg) do _arg
+                    subexpressions_not_involving_vars!(_arg, vars, state)
+                end
+            end
+            return arg
+        end
         subexpressions_not_involving_vars!(arg, vars, state)
     end
     return maketerm(typeof(expr), op, newargs, metadata(expr))