Merge pull request #195 from JuliaSymbolics/myb/rec

Fix for non-associative functions

Author: YingboMa

src/types.jl

@@ -290,6 +290,9 @@ function Base.hash(t::Term{T}, salt::UInt) where {T}
     return h′
 end
 
+isassociative(::Any) = false
+isassociative(::Union{typeof(+),typeof(*)}) = true
+
 _promote_symtype(f::Sym, args) = promote_symtype(f, map(symtype, args)...)
 function _promote_symtype(f, args)
     if length(args) == 0
@@ -298,9 +301,10 @@ function _promote_symtype(f, args)
         promote_symtype(f, symtype(args[1]))
     elseif length(args) == 2
         promote_symtype(f, symtype(args[1]), symtype(args[2]))
-    else
-        # TODO: maybe restrict it only to functions that are Associative
+    elseif isassociative(f)
         mapfoldl(symtype, (x,y) -> promote_symtype(f, x, y), args)
+    else
+        promote_symtype(f, map(symtype, args)...)
     end
 end
 

test/basics.jl

@@ -66,6 +66,10 @@ end
     @test isequal(a + x, Add(Number, 0, Dict(a=>1, x=>1)))
     @test isequal(a + z, Add(Number, 0, Dict(a=>1, z=>1)))
 
+    foo(w, z, a, b) = 1.0
+    SymbolicUtils.promote_symtype(::typeof(foo), args...) = Real
+    @test SymbolicUtils._promote_symtype(foo, (w, z, a, b,)) === Real
+
     # promote_symtype of identity
     @test isequal(Term(identity, [w]), Term{Complex}(identity, [w]))
     @test isequal(+(w), w)