Skip to content

Commit 5dceb20

Browse files
committed
updated syntax, fixed blockcopy
1 parent 3c38308 commit 5dceb20

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/utilities/block.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,25 @@ blocklength(x::Tuple) = sum(blocklength.(x))
3535
blocklength(x::AbstractArray) = length(x)
3636

3737
blockvecnorm(x::Tuple) = sqrt(blockvecdot(x, x))
38-
blockvecnorm{R <: Number}(x::AbstractArray{R}) = vecnorm(x)
38+
blockvecnorm(x::AbstractArray{R}) where {R <: Number} = vecnorm(x)
3939

4040
blockmaxabs(x::Tuple) = maximum(blockmaxabs.(x))
41-
blockmaxabs{R <: Number}(x::AbstractArray{R}) = maximum(abs, x)
41+
blockmaxabs(x::AbstractArray{R}) where {R <: Number}= maximum(abs, x)
4242

4343
blocksimilar(x::Tuple) = blocksimilar.(x)
4444
blocksimilar(x::AbstractArray) = similar(x)
4545

4646
blockcopy(x::Tuple) = blockcopy.(x)
47-
blockcopy(x::Array) = copy(x)
47+
blockcopy(x::AbstractArray) = copy(x)
4848

4949
blockcopy!(y::Tuple, x::Tuple) = blockcopy!.(y, x)
5050
blockcopy!(y::AbstractArray, x::AbstractArray) = copy!(y, x)
5151

5252
blockset!(y::Tuple, x) = blockset!.(y, x)
5353
blockset!(y::AbstractArray, x) = (y .= x)
5454

55-
blockvecdot{T <: Tuple}(x::T, y::T) = sum(blockvecdot.(x,y))
56-
blockvecdot{R <: Number}(x::AbstractArray{R}, y::AbstractArray{R}) = vecdot(x, y)
55+
blockvecdot(x::T, y::T) where {T <: Tuple} = sum(blockvecdot.(x,y))
56+
blockvecdot(x::AbstractArray{R}, y::AbstractArray{R}) where {R <: Number} = vecdot(x, y)
5757

5858
blockzeros(t::Tuple, s::Tuple) = blockzeros.(t, s)
5959
blockzeros(t::Type, n::NTuple{N, Integer} where {N}) = zeros(t, n)

0 commit comments

Comments
 (0)