Skip to content

Commit

Permalink
Merge 5c9bdd4 into 91c5621
Browse files Browse the repository at this point in the history
  • Loading branch information
@bkamins
bkamins committed Mar 8, 2018
2 parents 91c5621 + 5c9bdd4 commit 2282bd5
Show file tree
Hide file tree
Showing 3 changed files with 78 additions and 15 deletions.
69 changes: 55 additions & 14 deletions src/dataframe/dataframe.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,12 @@ function insert_single_column!(df::DataFrame,
push!(index(df), col_ind)
push!(df.columns, dv)
else
if !(typeof(col_ind) <: Integer)
throw(ArgumentError("Only Integer numbers accepted for column indexing"))
end
if isa(col_ind, Bool)
throw(ArgumentError("Bool values are not allowed for column indexing"))
end
if ncol(df) + 1 == Int(col_ind)
push!(index(df), nextcolname(df))
push!(df.columns, dv)
Expand All @@ -351,11 +357,17 @@ function insert_single_column!(df::DataFrame,
end

function insert_single_entry!(df::DataFrame, v::Any, row_ind::Real, col_ind::ColumnIndex)
if !(typeof(col_ind) <: Union{Integer,Symbol})
throw(ArgumentError("Only Integer numbers accepted for column indexing"))
end
if isa(col_ind, Bool)
throw(ArgumentError("Bool values are not allowed for column indexing"))
end
if haskey(index(df), col_ind)
df.columns[index(df)[col_ind]][row_ind] = v
return v
else
error("Cannot assign to non-existent column: $col_ind")
throw(ArgumentError("Cannot assign to non-existent column: $col_ind"))
end
end

Expand Down Expand Up @@ -383,11 +395,18 @@ end
# df[SingleColumnIndex] = AbstractVector
function Base.setindex!(df::DataFrame, v::AbstractVector, col_ind::ColumnIndex)
insert_single_column!(df, v, col_ind)
return df
end

# df[SingleColumnIndex] = Single Item (EXPANDS TO NROW(df) if NCOL(df) > 0)
function Base.setindex!(df::DataFrame, v, col_ind::ColumnIndex)
if haskey(index(df), col_ind)
if !(typeof(col_ind) <: Union{Integer,Symbol})
throw(ArgumentError("Only Integer numbers accepted for column indexing"))
end
if isa(col_ind, Bool)
throw(ArgumentError("Bool values are not allowed for column indexing"))
end
fill!(df[col_ind], v)
else
insert_single_column!(df, upgrade_scalar(df, v), col_ind)
Expand All @@ -396,25 +415,33 @@ function Base.setindex!(df::DataFrame, v, col_ind::ColumnIndex)
end

# df[MultiColumnIndex] = DataFrame
function Base.setindex!(df::DataFrame, new_df::DataFrame, col_inds::AbstractVector{Bool})
function Base.setindex!(df::DataFrame, new_df::DataFrame,
col_inds::AbstractVector{<:Union{Bool,Missing}})
length(col_inds) != ncol(df) && throw(BoundsError(df, col_inds))
setindex!(df, new_df, findall(col_inds))
end
function Base.setindex!(df::DataFrame,
new_df::DataFrame,
col_inds::AbstractVector{<:ColumnIndex})
# it is allowed that new_df has more columns than required
for j in 1:length(col_inds)
insert_single_column!(df, new_df[j], col_inds[j])
end
return df
end

# df[MultiColumnIndex] = AbstractVector (REPEATED FOR EACH COLUMN)
function Base.setindex!(df::DataFrame, v::AbstractVector, col_inds::AbstractVector{Bool})
function Base.setindex!(df::DataFrame, v::AbstractVector,
col_inds::AbstractVector{<:Union{Bool,Missing}})
length(col_inds) != ncol(df) && throw(BoundsError(df, col_inds))
setindex!(df, v, findall(col_inds))
end
function Base.setindex!(df::DataFrame,
v::AbstractVector,
col_inds::AbstractVector{<:ColumnIndex})
# this allows to add arbitrarily many columns to a DataFrame, e.g.
# x = DataFrame(); x[1:10] = rand(3)
# will create 10 new columns in x
for col_ind in col_inds
df[col_ind] = v
end
Expand All @@ -424,29 +451,35 @@ end
# df[MultiColumnIndex] = Single Item (REPEATED FOR EACH COLUMN; EXPANDS TO NROW(df) if NCOL(df) > 0)
function Base.setindex!(df::DataFrame,
val::Any,
col_inds::AbstractVector{Bool})
col_inds::AbstractVector{<:Union{Bool,Missing}})
length(col_inds) != ncol(df) && throw(BoundsError(df, col_inds))
setindex!(df, val, findall(col_inds))
end
function Base.setindex!(df::DataFrame, val::Any, col_inds::AbstractVector{<:ColumnIndex})
# this allows to add arbitrarily many columns to a DataFrame, e.g.
# x = DataFrame(); x[1:10] = 3
# will create 10 new columns in x
for col_ind in col_inds
df[col_ind] = val
end
return df
end

# df[:] = AbstractVector or Single Item
# df[:] = DataFrame, AbstractVector or Single Item
Base.setindex!(df::DataFrame, v, ::Colon) = (df[1:size(df, 2)] = v; df)

# df[SingleRowIndex, SingleColumnIndex] = Single Item
function Base.setindex!(df::DataFrame, v::Any, row_ind::Real, col_ind::ColumnIndex)
insert_single_entry!(df, v, row_ind, col_ind)
df
end

# df[SingleRowIndex, MultiColumnIndex] = Single Item
function Base.setindex!(df::DataFrame,
v::Any,
row_ind::Real,
col_inds::AbstractVector{Bool})
col_inds::AbstractVector{<:Union{Bool,Missing}})
length(col_inds) != ncol(df) && throw(BoundsError(df, col_inds))
setindex!(df, v, row_ind, findall(col_inds))
end
function Base.setindex!(df::DataFrame,
Expand All @@ -463,13 +496,15 @@ end
function Base.setindex!(df::DataFrame,
new_df::DataFrame,
row_ind::Real,
col_inds::AbstractVector{Bool})
col_inds::AbstractVector{<:Union{Bool,Missing}})
length(col_inds) != ncol(df) && throw(BoundsError(df, col_inds))
setindex!(df, new_df, row_ind, findall(col_inds))
end
function Base.setindex!(df::DataFrame,
new_df::DataFrame,
row_ind::Real,
col_inds::AbstractVector{<:ColumnIndex})
nrow(new_df) == 1 || throw(ArgumentError("Source DataFrame contains multiple rows"))
for j in 1:length(col_inds)
insert_single_entry!(df, new_df[j][1], row_ind, col_inds[j])
end
Expand Down Expand Up @@ -510,7 +545,8 @@ end
function Base.setindex!(df::DataFrame,
new_df::DataFrame,
row_inds::AbstractVector{Bool},
col_inds::AbstractVector{Bool})
col_inds::AbstractVector{<:Union{Bool,Missing}})
length(col_inds) != ncol(df) && throw(BoundsError(df, col_inds))
setindex!(df, new_df, findall(row_inds), findall(col_inds))
end
function Base.setindex!(df::DataFrame,
Expand All @@ -522,15 +558,16 @@ end
function Base.setindex!(df::DataFrame,
new_df::DataFrame,
row_inds::AbstractVector{<:Real},
col_inds::AbstractVector{Bool})
col_inds::AbstractVector{<:Union{Bool,Missing}})
length(col_inds) != ncol(df) && throw(BoundsError(df, col_inds))
setindex!(df, new_df, row_inds, findall(col_inds))
end
function Base.setindex!(df::DataFrame,
new_df::DataFrame,
row_inds::AbstractVector{<:Real},
col_inds::AbstractVector{<:ColumnIndex})
for j in 1:length(col_inds)
insert_multiple_entries!(df, new_df[:, j], row_inds, col_inds[j])
insert_multiple_entries!(df, new_df[j], row_inds, col_inds[j])
end
return df
end
Expand All @@ -539,7 +576,8 @@ end
function Base.setindex!(df::DataFrame,
v::AbstractVector,
row_inds::AbstractVector{Bool},
col_inds::AbstractVector{Bool})
col_inds::AbstractVector{<:Union{Bool,Missing}})
length(col_inds) != ncol(df) && throw(BoundsError(df, col_inds))
setindex!(df, v, findall(row_inds), findall(col_inds))
end
function Base.setindex!(df::DataFrame,
Expand All @@ -551,7 +589,8 @@ end
function Base.setindex!(df::DataFrame,
v::AbstractVector,
row_inds::AbstractVector{<:Real},
col_inds::AbstractVector{Bool})
col_inds::AbstractVector{Union{Bool,Missing}})
length(col_inds) != ncol(df) && throw(BoundsError(df, col_inds))
setindex!(df, v, row_inds, findall(col_inds))
end
function Base.setindex!(df::DataFrame,
Expand All @@ -568,7 +607,8 @@ end
function Base.setindex!(df::DataFrame,
v::Any,
row_inds::AbstractVector{Bool},
col_inds::AbstractVector{Bool})
col_inds::AbstractVector{Union{Bool,Missing}})
length(col_inds) != ncol(df) && throw(BoundsError(df, col_inds))
setindex!(df, v, findall(row_inds), findall(col_inds))
end
function Base.setindex!(df::DataFrame,
Expand All @@ -580,7 +620,8 @@ end
function Base.setindex!(df::DataFrame,
v::Any,
row_inds::AbstractVector{<:Real},
col_inds::AbstractVector{Bool})
col_inds::AbstractVector{Union{Bool,Missing}})
length(col_inds) != ncol(df) && throw(BoundsError(df, col_inds))
setindex!(df, v, row_inds, findall(col_inds))
end
function Base.setindex!(df::DataFrame,
Expand Down
2 changes: 1 addition & 1 deletion src/other/index.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ function Base.getindex(x::AbstractIndex, idx::AbstractVector{<:Integer})
if any(v -> v isa Bool, idx)
# TODO: this line should be changed to throw an error after deprecation
# throw(ArgumentError("Bool values except for Vector{Bool} are not allowed for column indexing"))
Base.depwarn("Indexing with Bool values is deprecated except for Vector{Bool}")
Base.depwarn("Indexing with Bool values is deprecated except for Vector{Bool}", :getindex)
end
Vector{Int}(idx)
end
Expand Down
22 changes: 22 additions & 0 deletions test/dataframe.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,28 @@ module TestDataFrame
df[3] = [1,2,3]
df[4] = [1,2,3]
@test names(df) == [:x3, :x3_1, :x3_2, :x4]
@test_throws BoundsError df[[true,false,true,false,true,false]] = df
@test_throws BoundsError df[[true,false,true,false,true,false]] = [1,2,3]
@test_throws BoundsError df[[true,false,true,false,true,false]] = 1
@test_throws TypeError df[[true, true, true, missing]] = df
@test_throws TypeError df[[true, true, true, missing]] = [1,2,3]
@test_throws TypeError df[[true, true, true, missing]] = 1
df[Union{Bool,Missing}[true, false, false, false]] = DataFrame([[100,100,100]])
@test df[1] == [100,100,100]
df[Union{Bool,Missing}[true, false, false, false]] = [0,0,0]
@test df[1] == [0,0,0]
df[Union{Bool,Missing}[true, false, false, false]] = 1000
@test df[1] == [1000,1000,1000]

df1 = DataFrame()
df1[1:10] = rand(3)
@test size(df1) == (3, 10)
df1 = DataFrame()
df1[1:10] = 3
@test size(df1) == (1, 10)

@test_throws ArgumentError df1[1.0] = 1
@test_throws ArgumentError df1[true] = 1
end

@testset "handling of end in indexing" begin
Expand Down

0 comments on commit 2282bd5

Please sign in to comment.