Skip to content

Commit 54af72f

Browse files
lrnvtansongchen
authored andcommitted
Modify scalar rules for +,-,/,*
1 parent b03b101 commit 54af72f

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

src/scalar.jl

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,14 @@ convert(::Type{TaylorScalar{T, N}}, x::TaylorScalar{T, N}) where {T, N} = x
7979
function convert(::Type{TaylorScalar{T, N}}, x::S) where {T, S, N}
8080
TaylorScalar{T, N}(convert(T, x))
8181
end
82-
for op in (:+, :-, :*, :/)
83-
@eval @inline $op(a::TaylorScalar, b::Number) = $op(promote(a, b)...)
84-
@eval @inline $op(a::Number, b::TaylorScalar) = $op(promote(a, b)...)
85-
end
82+
@inline +(a::Number, b::TaylorScalar) = TaylorScalar((a + value(b)[1]), value(b)[2:end]...)
83+
@inline -(a::Number, b::TaylorScalar) = TaylorScalar((a - value(b)[1]), .-value(b)[2:end]...)
84+
@inline *(a::Number, b::TaylorScalar) = TaylorScalar((a .* value(b))...)
85+
@inline /(a::Number, b::TaylorScalar) = /(promote(a, b)...)
86+
87+
@inline +(a::TaylorScalar, b::Number) = TaylorScalar((value(a)[1] + b), value(a)[2:end]...)
88+
@inline -(a::TaylorScalar, b::Number) = TaylorScalar((value(a)[1] - b), value(a)[2:end]...)
89+
@inline *(a::TaylorScalar, b::Number) = TaylorScalar((value(a) .* b)...)
90+
@inline /(a::TaylorScalar, b::Number) = TaylorScalar((value(a) ./ b)...)
91+
8692
transpose(t::TaylorScalar) = t

0 commit comments

Comments
 (0)