Disable auto_unbox inside matrix or array

jeroen · Oct 3, 2014 · 2a7ba7b · 2a7ba7b
1 parent c041232
commit 2a7ba7b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/NEWS b/NEWS
@@ -1,3 +1,6 @@
+0.9.13
+ - Prevent auto unboxing within a matrix
+
 0.9.12
  - New JSON parser based on yajl. Some changes:
     * smaller and faster than libjson

diff --git a/R/asJSON.array.R b/R/asJSON.array.R
@@ -1,5 +1,5 @@
 setMethod("asJSON", "array", function(x, collapse = TRUE, na = NULL, oldna = NULL,
-  matrix = c("rowmajor", "columnmajor"), ...) {
+  matrix = c("rowmajor", "columnmajor"), auto_unbox = FALSE, ...) {
 
   #validate
   matrix <- match.arg(matrix);
@@ -9,9 +9,9 @@ setMethod("asJSON", "array", function(x, collapse = TRUE, na = NULL, oldna = NUL
     na <- oldna;
   }
 
-  # row based json
   # if collapse == FALSE, then this matrix is nested inside a data frame,
   # and therefore row major is required to match dimensions
+  # dont pass auto_unbox (never unbox within matrix)
   margin <- ifelse(identical(matrix, "columnmajor") && isTRUE(collapse), length(dim(x)), 1);
   tmp <- apply(x, margin, asJSON, matrix = matrix, na = na, ...)