Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix repeat and some other minor issues #2648

Merged
merged 4 commits into from
Mar 10, 2021
Merged

fix repeat and some other minor issues #2648

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
52fe3d5
fix repeat and some other minor issues
bkamins Mar 8, 2021
6c76fbf
allow Bool as repeatition
bkamins Mar 8, 2021
d49e7eb
fix tests
bkamins Mar 9, 2021
3643659
revert old test
bkamins Mar 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/abstractdataframe/abstractdataframe.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1676,10 +1676,10 @@ julia> repeat(df, inner = 2, outer = 3)
12 │ 2 4
```
"""
function Base.repeat(df::AbstractDataFrame; inner::Integer = 1, outer::Integer = 1)
function Base.repeat(df::AbstractDataFrame; inner::Integer=1, outer::Integer=1)
inner < 0 && throw(ArgumentError("inner keyword argument must be non-negative"))
outer < 0 && throw(ArgumentError("outer keyword argument must be non-negative"))
return mapcols(x -> repeat(x, inner = inner, outer = outer), df)
return mapcols(x -> repeat(x, inner = Int(inner), outer = Int(outer)), df)
end

"""
Expand Down Expand Up @@ -1711,7 +1711,7 @@ julia> repeat(df, 2)
"""
function Base.repeat(df::AbstractDataFrame, count::Integer)
count < 0 && throw(ArgumentError("count must be non-negative"))
return mapcols(x -> repeat(x, count), df)
return mapcols(x -> repeat(x, Int(count)), df)
end

##############################################################################
Expand Down
4 changes: 2 additions & 2 deletions src/dataframe/dataframe.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1616,7 +1616,7 @@ julia> df
function repeat!(df::DataFrame; inner::Integer = 1, outer::Integer = 1)
inner < 0 && throw(ArgumentError("inner keyword argument must be non-negative"))
outer < 0 && throw(ArgumentError("outer keyword argument must be non-negative"))
return mapcols!(x -> repeat(x, inner = inner, outer = outer), df)
return mapcols!(x -> repeat(x, inner = Int(inner), outer = Int(outer)), df)
end

"""
Expand Down Expand Up @@ -1648,7 +1648,7 @@ julia> repeat(df, 2)
"""
function repeat!(df::DataFrame, count::Integer)
count < 0 && throw(ArgumentError("count must be non-negative"))
return mapcols!(x -> repeat(x, count), df)
return mapcols!(x -> repeat(x, Int(count)), df)
end

# This is not exactly copy! as in general we allow axes to be different
Expand Down
2 changes: 1 addition & 1 deletion test/broadcasting.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -987,7 +987,7 @@ end
@test levels(df.c4) == levels(v)
@test levels(df.c4) !== levels(v)
df[!, :c5] .= (x->v[2]).(v)
@test unique(df.c5) == [get(v[2])]
@test unique(df.c5) == [unwrap(v[2])]
@test df.c5 isa CategoricalVector
@test levels(df.c5) == levels(v)
end
Expand Down
5 changes: 3 additions & 2 deletions test/subdataframe.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,9 @@ end
@test_throws ArgumentError SubDataFrame(sdf, true, :)
@test_throws ArgumentError SubDataFrame(sdf, Integer[true], 1)

# this is an error in Julia Base
SubDataFrame(sdf, Integer[true, true, true], :) == SubDataFrame(sdf, [1, 1, 1], :)
if VERSION > v"1.6"
@test_throws ArgumentError SubDataFrame(sdf, Integer[true, true, true], :)
end
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And what happens before 1.6? :-)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Before (and including 1.6) 1.7 it works - see the old test that got removed.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean, shouldn't this be tested too?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK - I have reverted it (although it was kept mainly to keep track of the bug in Julia Base).

A follow up PR in Julia Base that should be fixed is JuliaLang/julia#39962 (I am pinging you as it seem no one commented on it).

end

end # module
1 change: 0 additions & 1 deletion test/utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ end
@test size(repeat(df, inner = 0, outer = 3)) == (0, 2)
@test size(repeat(df, inner = 2, outer = false)) == (0, 2)
@test size(repeat(df, inner = false, outer = 3)) == (0, 2)

@test_throws ArgumentError repeat(df, inner = 2, outer = -1)
@test_throws ArgumentError repeat(df, inner = -1, outer = 3)
end
Expand Down