Skip to content
This repository was archived by the owner on May 4, 2019. It is now read-only.

Commit 57bea9f

Browse files
authored
Merge pull request #199 from JuliaStats/nl/repeat
Loosen type signature for repeat()
2 parents 42f396d + a58b252 commit 57bea9f

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/extras.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@ end
6464
cut(x::AbstractVector, ngroups::Integer) = cut(x, quantile(x, [1 : ngroups - 1] / ngroups))
6565

6666
function Base.repeat{T,N}(A::DataArray{T,N};
67-
inner::Array{Int} = ones(Int, ndims(A)),
68-
outer::Array{Int} = ones(Int, ndims(A)))
67+
inner = ntuple(x->1, ndims(A)),
68+
outer = ntuple(x->1, ndims(A)))
6969
DataArray{T,N}(Compat.repeat(A.data; inner=inner, outer=outer),
7070
BitArray(Compat.repeat(A.na; inner=inner, outer=outer)))
7171
end
7272

7373
function Base.repeat{T,R,N}(A::PooledDataArray{T,R,N};
74-
inner::Array{Int} = ones(Int, ndims(A)),
75-
outer::Array{Int} = ones(Int, ndims(A)))
74+
inner = ntuple(x->1, ndims(A)),
75+
outer = ntuple(x->1, ndims(A)))
7676
PooledDataArray(RefArray{R,N}(Compat.repeat(A.refs; inner=inner, outer=outer)),
7777
A.pool)
7878
end

test/extras.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ module TestExtras
4040
## repeat
4141
##########
4242

43-
@test isequal(repeat(@data [3.0, 2.0, NA]; inner = [2], outer = [1]),
43+
@test isequal(repeat(@data [3.0, 2.0, NA]; inner = 2, outer = 1),
4444
@data [3.0, 3.0, 2.0, 2.0, NA, NA])
45-
@test isequal(repeat(@pdata ["a", "b", NA]; inner = [2], outer = [1]),
45+
@test isequal(repeat(@pdata ["a", "b", NA]; inner = 2, outer = 1),
4646
@pdata ["a", "a", "b", "b", NA, NA])
4747
@test isequal(repeat(@data [1 2; 3 NA]; inner = [1, 2], outer = [2, 1]),
4848
@data [1 1 2 2; 3 3 NA NA; 1 1 2 2; 3 3 NA NA])

0 commit comments

Comments
 (0)