Merge pull request #803 from JuliaSymbolics/as/fix-promote-symtype

fix: fix `promote_symtype` for non-`Array` arrays

Author: AayushSabharwal

src/methods.jl

@@ -128,12 +128,16 @@ for f in vcat(diadic, [+, -, *, ^, Base.add_sum, Base.mul_prod])
             return S
         elseif S <: T
             return T
+        elseif T <: AbstractArray && !(T <: Array)
+            return promote_symtype($f, Array{eltype(T), ndims(T)::Int}, S)
+        elseif S <: AbstractArray && !(S <: Array)
+            return promote_symtype($f, T, Array{eltype(S), ndims(S)::Int})
         elseif $(f === (*) || f === Base.mul_prod) && T <: AbstractMatrix && S <: AbstractVecOrMat
-            return Array{promote_symtype(*, T.parameters[1]::TypeT, S.parameters[1]::TypeT), S.parameters[2]}
+            return Array{promote_symtype(*, T.parameters[1]::TypeT, S.parameters[1]::TypeT), S.parameters[2]::Int}
         elseif $(f === (*) || f === Base.mul_prod) && T <: AbstractArray && S <: Number
-            return Array{promote_symtype(*, T.parameters[1]::TypeT, S), T.parameters[2]}
+            return Array{promote_symtype(*, T.parameters[1]::TypeT, S), T.parameters[2]::Int}
         elseif $(f === (*) || f === Base.mul_prod) && T <: Number && S <: AbstractArray
-            return Array{promote_symtype(*, T, S.parameters[1]::TypeT), S.parameters[2]}
+            return Array{promote_symtype(*, T, S.parameters[1]::TypeT), S.parameters[2]::Int}
         elseif $(f === (+) || f === Base.add_sum || f === (-)) && T <: AbstractArray && S <: AbstractArray
             nd = T.parameters[2]::Int
             @assert nd == S.parameters[2]::Int
@@ -191,6 +195,10 @@ for f in [/, \]
             return Real
         elseif T <: Rational && S <: Integer
             return Real
+        elseif T <: AbstractArray && !(T <: Array)
+            return promote_symtype($f, Array{eltype(T), ndims(T)::Int}, S)
+        elseif S <: AbstractArray && !(S <: Array)
+            return promote_symtype($f, T, Array{eltype(S), ndims(S)::Int})
         elseif $(f === (\)) && T <: Number && S <: AbstractArray
             return Array{promote_symtype(/, T, S.parameters[1]::TypeT), S.parameters[2]::Int}
         elseif $(f === (\)) && T <: AbstractVector && S <: AbstractVector

test/basics.jl

@@ -5,6 +5,7 @@ import MultivariatePolynomials as MP
 using Setfield
 using Test, ReferenceTests
 import LinearAlgebra
+using SparseArrays
 
 include("utils.jl")
 
@@ -1179,3 +1180,12 @@ end
         end
     end
 end
+
+@testset "promote_symtype with sparse operations" begin
+    S = sprand(5, 5, 0.1)
+    @syms z[1:5, 1:5]::Real
+    @test SymbolicUtils.promote_symtype(*, typeof(S), symtype(z)) == Matrix{Real}
+    @test SymbolicUtils.promote_symtype(+, typeof(S), symtype(z)) == Matrix{Real}
+    @test SymbolicUtils.promote_symtype(\, typeof(S), symtype(z)) == Matrix{Real}
+    @test SymbolicUtils.promote_symtype(/, typeof(S), symtype(z)) == Matrix{Real}
+end