support NamedArrays

REQUIRE

@@ -4,5 +4,6 @@ DataFrames 0.9
 NullableArrays 0.1.0
 CategoricalArrays 0.1.0
 AxisArrays 0.0.6
+NamedArrays 0.5.3
 Compat 0.20.0
 @windows WinReg 0.2.0

docs/src/conversions.md

@@ -1,10 +1,11 @@
 # Conversions
 
-RCall supports conversions to and from most base Julia types and popular Statistics packages, e.g., `DataFrames`, `DataArrays`, `NullableArrays`, `CategoricalArrays` and `AxisArrays`.
+RCall supports conversions to and from most base Julia types and popular Statistics packages, e.g., `DataFrames`, `DataArrays`, `NullableArrays`, `CategoricalArrays` `NamedArrays` and `AxisArrays`.
 
 ```@setup 1
 using RCall
 using DataFrames
+using NamedArrays
 using AxisArrays
 ```
 
@@ -94,11 +95,25 @@ To avoid the sanitization, use `sanitize` option.
 rcopy(R"data.frame(a.b = 1:10)"; sanitize = false)
 ```
 
+## NamedArrays
+
+```@example 1
+# Julia -> R
+aa = NamedArray([1,2,3], [["a", "b", "c"]], [:id])
+r = RObject(aa)
+```
+
+```@example 1
+# R -> Julia
+rcopy(r)
+```
+
+
 ## AxisArrays
 
 ```@example 1
 # Julia -> R
-aa = AxisArray([1,2,3], Axis{:name}(["a", "b", "c"]))
+aa = AxisArray([1,2,3], Axis{:id}(["a", "b", "c"]))
 r = RObject(aa)
 ```
 

src/RCall.jl

@@ -5,7 +5,7 @@ using Compat
 using DataFrames
 # using DataTables
 using NullableArrays, CategoricalArrays
-using AxisArrays
+using AxisArrays, NamedArrays
 
 import DataStructures: OrderedDict
 
@@ -31,6 +31,7 @@ include("convert/dataframe.jl")
 include("convert/datatable.jl")
 include("convert/datetime.jl")
 include("convert/axisarray.jl")
+include("convert/namedarray.jl")
 include("convert/default.jl")
 include("eventloop.jl")
 include("eval.jl")

src/convert/axisarray.jl

@@ -5,15 +5,13 @@ function rcopy{S<:VectorSxp}(::Type{AxisArray}, r::Ptr{S})
     AxisArray(rcopy(Array, r), [Axis{dsym[i]}(rcopy(n)) for (i,n) in enumerate(dnames)]...)
 end
 
-
 for S in (:IntSxp, :RealSxp, :CplxSxp, :LglSxp, :StrSxp)
     @eval begin
         function sexp(::Type{$S}, aa::AxisArray)
             rv = protect(sexp($S, aa.data))
             try
                 d = OrderedDict(
                     k => v.val for (k, v) in zip(axisnames(aa), axes(aa)))
-                setattrib!(rv, Const.ClassSymbol, "array")
                 setattrib!(rv, Const.DimSymbol, collect(size(aa)))
                 setattrib!(rv, Const.DimNamesSymbol, d)
             finally

src/convert/default.jl

@@ -152,13 +152,14 @@ for typ in [:NullableCategoricalArray, :CategoricalArray]
     @eval sexp(v::$typ) = sexp(IntSxp, v)
 end
 
-# AxisArray
+# AxisArray and NamedArray
 for (J,S) in ((:Integer,:IntSxp),
                  (:AbstractFloat, :RealSxp),
                  (:Complex, :CplxSxp),
                  (:Bool, :LglSxp),
                  (:AbstractString, :StrSxp))
     @eval sexp{T<:$J}(aa::AxisArray{T}) = sexp($S, aa)
+    @eval sexp{T<:$J}(aa::NamedArray{T}) = sexp($S, aa)
 end
 
 # DataTime

src/convert/namedarray.jl

@@ -0,0 +1,23 @@
+function rcopy{S<:VectorSxp}(::Type{NamedArray}, r::Ptr{S})
+    dnames = getattrib(r, Const.DimNamesSymbol)
+    isnull(dnames) && error("r has no dimnames")
+    d = [rcopy(Vector{String}, n) for n in dnames]
+    NamedArray(rcopy(Array, r), d, rcopy(Vector{Symbol}, getnames(dnames)))
+end
+
+for S in (:IntSxp, :RealSxp, :CplxSxp, :LglSxp, :StrSxp)
+    @eval begin
+        function sexp(::Type{$S}, na::NamedArray)
+            rv = protect(sexp($S, na.array))
+            try
+                d = OrderedDict(
+                    k => v for (k, v) in zip(dimnames(na), names(na)))
+                setattrib!(rv, Const.DimSymbol, collect(size(na)))
+                setattrib!(rv, Const.DimNamesSymbol, d)
+            finally
+                unprotect(1)
+            end
+            rv
+        end
+    end
+end

test/convert/namedarray.jl

@@ -0,0 +1,8 @@
+using NamedArrays
+
+# NamedArray
+aa = rcopy(NamedArray, R"Titanic")
+@test size(aa) == (4, 2, 2, 2)
+@test length(names(aa)[1]) == 4
+@test_throws ErrorException rcopy(NamedArray, R"c(1,1)")
+@test names(getattrib(RObject(aa), :dimnames))[1] == :Class

test/runtests.jl

@@ -15,6 +15,7 @@ tests = ["basic",
          "convert/datatable",
          "convert/datetime",
          "convert/axisarray",
+         "convert/namedarray",
          "library",
          "render",
          "repl",