Skip to content

Commit b9bda83

Browse files
committed
Changes suggested by @lbenet 's review
1 parent dad55f6 commit b9bda83

File tree

1 file changed

+4
-18
lines changed

1 file changed

+4
-18
lines changed

src/evaluate.jl

+4-18
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ function evaluate{T<:Number}(a::Taylor1{T}, x::Taylor1{T})
9797
end
9898
suma
9999
end
100-
function evaluate{T<:NumberNotSeries}(a::Taylor1{Taylor1{T}}, x::Taylor1{T})
100+
101+
function evaluate{T<:Number}(a::Taylor1{Taylor1{T}}, x::Taylor1{T})
101102
@inbounds suma = a[end]
102103
@inbounds for k = a.order:-1:1
103104
suma = suma*x + a[k]
@@ -127,7 +128,7 @@ function evaluate!{T<:Number}(x::Array{TaylorN{T},1}, δx::Array{T,1},
127128
nothing
128129
end
129130

130-
function evaluate!{T<:NumberNotSeries}(x::Array{TaylorN{T},1}, δx::Array{Taylor1{T},1},
131+
function evaluate!{T<:NumberNotSeriesN}(x::Array{TaylorN{T},1}, δx::Array{Taylor1{T},1},
131132
x0::Array{Taylor1{T},1})
132133
@assert length(x) == length(x0)
133134
@inbounds for i in eachindex(x)
@@ -136,15 +137,6 @@ function evaluate!{T<:NumberNotSeries}(x::Array{TaylorN{T},1}, δx::Array{Taylor
136137
nothing
137138
end
138139

139-
function evaluate!{T<:NumberNotSeries}(x::Array{TaylorN{Taylor1{T}},1}, δx::Array{Taylor1{T},1},
140-
x0::Array{Taylor1{T},1})
141-
@assert length(x) == length(x0)
142-
@inbounds for i in eachindex(x)
143-
x0[i] = evaluate( x[i], δx )
144-
end
145-
nothing
146-
end
147-
148140
function evaluate!{T<:Number}(x::Array{Taylor1{TaylorN{T}},1}, δt::T,
149141
x0::Array{TaylorN{T},1})
150142
@assert length(x) == length(x0)
@@ -277,13 +269,7 @@ function evaluate{T<:Number}(x::Array{TaylorN{T},1}, δx::Array{T,1})
277269
return x0
278270
end
279271

280-
function evaluate{T<:NumberNotSeries}(x::Array{TaylorN{T},1}, δx::Array{Taylor1{T},1})
281-
x0 = Array{Taylor1{T}}( length(x) )
282-
evaluate!( x, δx, x0 )
283-
return x0
284-
end
285-
286-
function evaluate{T<:NumberNotSeries}(x::Array{TaylorN{Taylor1{T}},1}, δx::Array{Taylor1{T},1})
272+
function evaluate{T<:NumberNotSeriesN}(x::Array{TaylorN{T},1}, δx::Array{Taylor1{T},1})
287273
x0 = Array{Taylor1{T}}( length(x) )
288274
evaluate!( x, δx, x0 )
289275
return x0

0 commit comments

Comments
 (0)