Further refinements

grimbough · Nov 17, 2017 · d61695b · d61695b
1 parent 5f22aa2
commit d61695b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -8,7 +8,7 @@ Description: Wrapping an array-like object (typically an on-disk object) in
 	also works on in-memory array-like objects like DataFrame objects
 	(typically with Rle columns), Matrix objects, and ordinary arrays and
 	data frames.
-Version: 0.5.2
+Version: 0.5.1-1
 Encoding: UTF-8
 Author: Hervé Pagès
 Maintainer: Hervé Pagès <hpages@fredhutch.org>

diff --git a/R/DelayedArray-class.R b/R/DelayedArray-class.R
@@ -798,9 +798,15 @@ setReplaceMethod("[", "DelayedArray", .subassign_DelayedArray)
     if (!isTRUEorFALSE(drop))
         stop("'drop' must be TRUE or FALSE")
     ans <- subset_seed_as_array(seed(x), unname(x@index))
-    dim(ans) <- .get_DelayedArray_dim_before_transpose(x)
+    dim_ans <- .get_DelayedArray_dim_before_transpose(x)
+    if(!identical(dim(ans), dim_ans)) {
+        dim(ans) <- dim_ans
+    }
     ans <- .execute_delayed_ops(ans, x@delayed_ops)
-    dimnames(ans) <- .get_DelayedArray_dimnames_before_transpose(x)
+    dimnames_ans <- .get_DelayedArray_dimnames_before_transpose(x)
+    if(!identical(dimnames(ans), dimnames_ans)) {
+        dimnames(ans) <- dimnames_ans
+    }
     if (drop)
         ans <- .reduce_array_dimensions(ans)
     ## Base R doesn't support transposition of an array of arbitrary dimension