ArgumentErrorfor promotion among non-compatible Taylor1 and TaylorN (#…

…220) Fixes #219
JuliaDiff · Jul 12, 2019 · ad6f423 · ad6f423
1 parent e82c031
commit ad6f423
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/src/arithmetic.jl b/src/arithmetic.jl
@@ -200,6 +200,10 @@ for (f, fc) in ((:+, :(add!)), (:-, :(subst!)))
     end
 end
 
++(a::Taylor1{T}, b::TaylorN{S}) where {T<:NumberNotSeries,S<:NumberNotSeries} =
+    +(promote(a,b)...)
+-(a::Taylor1{T}, b::TaylorN{S}) where {T<:NumberNotSeries,S<:NumberNotSeries} =
+    -(promote(a,b)...)
 
 
 ## Multiplication ##

diff --git a/src/conversion.jl b/src/conversion.jl
@@ -200,3 +200,6 @@ promote_rule(::Type{S}, ::Type{T}) where {S<:NumberNotSeries, T<:AbstractSeries}
 
 promote_rule(::Type{S}, ::Type{T}) where
     {S<:AbstractIrrational, T<:AbstractSeries} = promote_rule(T,S)
+
+promote_rule(::Type{Taylor1{T}}, ::Type{TaylorN{S}}) where {T<:NumberNotSeries, S<:NumberNotSeries} =
+    throw(ArgumentError("There is no reasonable promotion among `Taylor1{$T}` and `TaylorN{$S}` types"))
diff --git a/test/mixtures.jl b/test/mixtures.jl
@@ -273,4 +273,9 @@ using LinearAlgebra, SparseArrays
     Qv = convert.(Taylor1{TaylorN{Float64}}, Pv)
 
     @test TaylorSeries.jacobian(Pv) == TaylorSeries.jacobian(Qv)
+
+    @test_throws ArgumentError Taylor1(2) + TaylorN(1)
+    @test_throws ArgumentError Taylor1(2) - TaylorN(1)
+    @test_throws ArgumentError Taylor1(2) * TaylorN(1)
+    @test_throws ArgumentError TaylorN(2) / Taylor1(1)
 end