Conversion of R data.frame with matrix columns (#291)

JuliaInterop · Jan 6, 2019 · 06a877d · 06a877d
1 parent 73d9410
commit 06a877d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/convert/dataframe.jl b/src/convert/dataframe.jl
@@ -12,7 +12,7 @@ function rcopy(::Type{T}, s::Ptr{VecSxp};
     if normalizenames
         vnames = [Symbol(replace(string(v), '.' => '_')) for v in vnames]
     end
-    DataFrame([rcopy(AbstractArray, c) for c in s], vnames)
+    DataFrame([vec(rcopy(AbstractArray, c)) for c in s], vnames)
 end
 
 ## DataFrame to sexp conversion.

diff --git a/test/convert/dataframe.jl b/test/convert/dataframe.jl
@@ -7,7 +7,7 @@ attenu = rcopy(DataFrame,reval(:attenu))
 @test size(attenu) == (182,5)
 @test rcopy(rcall(:dim,RObject(attenu))) == [182,5]
 @test rcopy(rcall(:dim, RObject(attenu[1:2, :]))) == [2, 5]
-@test rcopy(rcall(:dim, RObject(view(attenu, 1:2)))) == [2, 5]
+@test rcopy(rcall(:dim, RObject(view(attenu, 1:2, :)))) == [2, 5]
 dist = attenu[:dist]
 @test isa(dist,Array{Float64})
 station = attenu[:station]
@@ -19,3 +19,8 @@ station = attenu[:station]
 # issue #186
 df = R"""data.frame(dates = as.Date(c("2017-04-14", "2014-04-17")))"""
 @test eltype(rcopy(df)[:dates]) == Date
+
+# issue #290
+R"a = data.frame(a1 = rep(1,3)); a$a2 = matrix(2,3,1)"
+R"b = data.frame(a1 = rep(1,3)); b$a2 = rep(2,3)"
+@test rcopy(R"a") == rcopy(R"b")