Skip to content

Commit de957a5

Browse files
authoredDec 31, 2016
Merge pull request #19798 from tkelman/tk/monodevec
Minor tweaks to #19791
2 parents 6629f51 + f8892dc commit de957a5

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed
 

‎base/deprecated.jl

+5-5
Original file line numberDiff line numberDiff line change
@@ -1370,30 +1370,30 @@ end
13701370
@deprecate round(M::Bidiagonal) round.(M)
13711371
@deprecate round(M::Tridiagonal) round.(M)
13721372
@deprecate round(M::SymTridiagonal) round.(M)
1373-
@deprecate round{T<:Integer}(::Type{T}, x::AbstractArray) round.(T, x)
1374-
@deprecate round{T<:Integer}(::Type{T}, x::AbstractArray, r::RoundingMode) round.(x, r)
1373+
@deprecate round{T}(::Type{T}, x::AbstractArray) round.(T, x)
1374+
@deprecate round{T}(::Type{T}, x::AbstractArray, r::RoundingMode) round.(x, r)
13751375
@deprecate round(x::AbstractArray, r::RoundingMode) round.(x, r)
13761376
@deprecate round(x::AbstractArray, digits::Integer, base::Integer = 10) round.(x, digits, base)
13771377

13781378
# Deprecate manually vectorized trunc methods in favor of compact broadcast syntax
13791379
@deprecate trunc(M::Bidiagonal) trunc.(M)
13801380
@deprecate trunc(M::Tridiagonal) trunc.(M)
13811381
@deprecate trunc(M::SymTridiagonal) trunc.(M)
1382-
@deprecate trunc{T<:Integer}(::Type{T}, x::AbstractArray) trunc.(T, x)
1382+
@deprecate trunc{T}(::Type{T}, x::AbstractArray) trunc.(T, x)
13831383
@deprecate trunc(x::AbstractArray, digits::Integer, base::Integer = 10) trunc.(x, digits, base)
13841384

13851385
# Deprecate manually vectorized floor methods in favor of compact broadcast syntax
13861386
@deprecate floor(M::Bidiagonal) floor.(M)
13871387
@deprecate floor(M::Tridiagonal) floor.(M)
13881388
@deprecate floor(M::SymTridiagonal) floor.(M)
1389-
@deprecate floor{T<:Integer}(::Type{T}, A::AbstractArray) floor.(T, A)
1389+
@deprecate floor{T}(::Type{T}, A::AbstractArray) floor.(T, A)
13901390
@deprecate floor(A::AbstractArray, digits::Integer, base::Integer = 10) floor.(A, digits, base)
13911391

13921392
# Deprecate manually vectorized ceil methods in favor of compact broadcast syntax
13931393
@deprecate ceil(M::Bidiagonal) ceil.(M)
13941394
@deprecate ceil(M::Tridiagonal) ceil.(M)
13951395
@deprecate ceil(M::SymTridiagonal) ceil.(M)
1396-
@deprecate ceil{T<:Integer}(::Type{T}, x::AbstractArray) ceil.(T, x)
1396+
@deprecate ceil{T}(::Type{T}, x::AbstractArray) ceil.(T, x)
13971397
@deprecate ceil(x::AbstractArray, digits::Integer, base::Integer = 10) ceil.(x, digits, base)
13981398

13991399
# Deprecate manually vectorized `big` methods in favor of compact broadcast syntax

‎base/sparse/sparsevector.jl

+7-5
Original file line numberDiff line numberDiff line change
@@ -1266,16 +1266,18 @@ end
12661266
# definition of other binary functions
12671267

12681268
broadcast{Tx<:Real,Ty<:Real}(::typeof(min), x::SparseVector{Tx}, y::SparseVector{Ty}) = _binarymap(min, x, y, 2)
1269-
broadcast{Tx<:Real,Ty<:Real}(::typeof(min), x::StridedVector{Tx}, y::SparseVector{Ty}) = _binarymap(min, x, y, 2)
1270-
broadcast{Tx<:Real,Ty<:Real}(::typeof(min), x::SparseVector{Tx}, y::SparseVector{Ty}) = _binarymap(min, x, y, 2)
1269+
broadcast{Tx<:Real,Ty<:Real}(::typeof(min), x::AbstractSparseVector{Tx}, y::AbstractSparseVector{Ty}) = _binarymap(min, x, y, 2)
1270+
broadcast{Tx<:Real,Ty<:Real}(::typeof(min), x::StridedVector{Tx}, y::AbstractSparseVector{Ty}) = _binarymap(min, x, y, 2)
1271+
broadcast{Tx<:Real,Ty<:Real}(::typeof(min), x::AbstractSparseVector{Tx}, y::StridedVector{Ty}) = _binarymap(min, x, y, 2)
12711272

12721273
broadcast{Tx<:Real,Ty<:Real}(::typeof(max), x::SparseVector{Tx}, y::SparseVector{Ty}) = _binarymap(max, x, y, 2)
1273-
broadcast{Tx<:Real,Ty<:Real}(::typeof(max), x::StridedVector{Tx}, y::SparseVector{Ty}) = _binarymap(max, x, y, 2)
1274-
broadcast{Tx<:Real,Ty<:Real}(::typeof(max), x::SparseVector{Tx}, y::SparseVector{Ty}) = _binarymap(max, x, y, 2)
1274+
broadcast{Tx<:Real,Ty<:Real}(::typeof(max), x::AbstractSparseVector{Tx}, y::AbstractSparseVector{Ty}) = _binarymap(max, x, y, 2)
1275+
broadcast{Tx<:Real,Ty<:Real}(::typeof(max), x::StridedVector{Tx}, y::AbstractSparseVector{Ty}) = _binarymap(max, x, y, 2)
1276+
broadcast{Tx<:Real,Ty<:Real}(::typeof(max), x::AbstractSparseVector{Tx}, y::StridedVector{Ty}) = _binarymap(max, x, y, 2)
12751277

1278+
complex{Tx<:Real,Ty<:Real}(x::AbstractSparseVector{Tx}, y::AbstractSparseVector{Ty}) = _binarymap(complex, x, y, 1)
12761279
complex{Tx<:Real,Ty<:Real}(x::StridedVector{Tx}, y::AbstractSparseVector{Ty}) = _binarymap(complex, x, y, 1)
12771280
complex{Tx<:Real,Ty<:Real}(x::AbstractSparseVector{Tx}, y::StridedVector{Ty}) = _binarymap(complex, x, y, 1)
1278-
complex{Tx<:Real,Ty<:Real}(x::AbstractSparseVector{Tx}, y::AbstractSparseVector{Ty}) = _binarymap(complex, x, y, 1)
12791281

12801282
### Reduction
12811283

0 commit comments

Comments
 (0)
Please sign in to comment.