fix #5

Author: mschubert

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: narray
 Title: R Package for Handling Arrays in a Consistent Manner
-Version: 0.2.1
+Version: 0.2.2
 Author: Michael Schubert <mschu.dev@gmail.com>
 Maintainer: Michael Schubert <mschu.dev@gmail.com>
 Description: Provides functions to query and manipulate arrays

R/split.r

@@ -12,12 +12,18 @@ split = function(X, along, subsets=c(1:dim(X)[along]), drop=FALSE) {
     if (along == -1)
         along = length(dim(X))
 
-    usubsets = unique(subsets)
+    if (any(is.na(subsets)))
+        warning("'subsets' contains NA, dropping those values")
+
+    usubsets = stats::na.omit(unique(subsets))
     lus = length(usubsets)
     idxList = base::rep(list(base::rep(list(TRUE), length(dim(X)))), lus)
 
-    for (i in 1:lus)
-        idxList[[i]][[along]] = subsets==usubsets[i]
+    for (i in 1:lus) {
+        cur = subsets==usubsets[i]
+        cur[is.na(cur)] = FALSE
+        idxList[[i]][[along]] = cur
+    }
 
     if (length(usubsets)!=dim(X)[along] || !is.numeric(subsets))
         lnames = usubsets

R/subset.r

@@ -25,5 +25,8 @@ subset = function(X, index, along=NULL, drop=FALSE) {
         index = tmp
     }
 
+    if (any(is.na(unlist(index))))
+        stop("trying to subset with NA in index")
+
     do.call(function(...) `[`(X, ..., drop=drop), index)
 }

tests/testthat/test_split.r

@@ -17,3 +17,11 @@ test_that("3-dimensional array", {
 
     expect_equal(Y, Yref)
 })
+
+test_that("NA in subsets", {
+    C = structure(c(1L, 2L, 3L, 4L, 6L, 5L), .Dim = 2:3,
+        .Dimnames = list(c("a", "b"), c("x", "y", "z")))
+
+    expect_warning(x <- split(C, along=2, subsets=c(1,1,NA)))
+    expect_equal(x, list(`1`=C[,c(1:2)]))
+})

tests/testthat/test_subset.r

@@ -28,3 +28,7 @@ test_that("everything", {
                 subset(C, LETTERS[3], along=2, drop=FALSE),
                 subset(C, c(FALSE, FALSE, TRUE, FALSE, along=2, drop=FALSE)))
 })
+
+test_that("subset with NA", {
+    expect_error(subset(1:5, index=c(rep(FALSE, 4), NA)))
+})