Skip to content

Commit

Permalink
Merge pull request #509 from tshort/symbol-column-names
Browse files Browse the repository at this point in the history
Convert to using only symbols for column names.
  • Loading branch information
tshort committed Jan 29, 2014
2 parents 276c8f8 + f846da4 commit 5591ca4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
3 changes: 2 additions & 1 deletion src/RDA.jl
Original file line number Diff line number Diff line change
Expand Up @@ -306,4 +306,5 @@ function data(rc::RComplex)
BitArray(imag(rc.data) .== R_NA_FLOAT64))
end

DataFrame(rl::RList) = DataFrame(map(x->data(x), rl.data), rl.attr["names"].data)
DataFrame(rl::RList) = DataFrame(map(x->data(x), rl.data),
Symbol[symbol(x) for x in rl.attr["names"].data])
10 changes: 5 additions & 5 deletions test/RDA.jl
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ module TestRDA
df = DataFrame(num = [1.1, 2.2])
@assert isequal(DataFrame(read_rda("test/data/RDA/minimal.rda")["df"]), df)

df["int"] = Int32[1, 2]
df["logi"] = [true, false]
df["chr"] = ["ab", "c"]
df["factor"] = pool(df["chr"])
df[:int] = Int32[1, 2]
df[:logi] = [true, false]
df[:chr] = ["ab", "c"]
df[:factor] = pool(df[:chr])
@assert isequal(DataFrame(read_rda("test/data/RDA/types.rda")["df"]), df)

df[2, :] = NA
df = df[:, ["num", "int", "logi", "factor"]] # (NA) chr breaks read_rda
df = df[:, [:num, :int, :logi, :factor]] # (NA) chr breaks read_rda
@assert isequal(DataFrame(read_rda("test/data/RDA/NAs.rda")["df"]), df)
end

0 comments on commit 5591ca4

Please sign in to comment.