diff --git a/DESCRIPTION b/DESCRIPTION index ea669d8..d3b530d 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: TileDBArray -Version: 1.19.0 -Date: 2024-10-01 +Version: 1.19.1 +Date: 2025-06-19 Title: Using TileDB as a DelayedArray Backend Description: Implements a DelayedArray backend for reading and writing dense or sparse arrays in the TileDB format. The diff --git a/NAMESPACE b/NAMESPACE index 48b4bdb..6f431cd 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -45,7 +45,6 @@ importFrom(S4Vectors,isSingleString) importFrom(S4Vectors,setValidity2) importFrom(SparseArray,COO_SparseArray) importFrom(SparseArray,extract_sparse_array) -importFrom(SparseArray,nzcoo) -importFrom(SparseArray,nzdata) +importFrom(SparseArray,nzvals) importFrom(SparseArray,nzwhich) importFrom(methods,show) diff --git a/R/TileDBRealizationSink.R b/R/TileDBRealizationSink.R index 3c120cb..f626f49 100644 --- a/R/TileDBRealizationSink.R +++ b/R/TileDBRealizationSink.R @@ -207,7 +207,7 @@ setValidity2("TileDBRealizationSink", function(object) { #' @export #' @importClassesFrom SparseArray COO_SparseArray -#' @importFrom SparseArray nzcoo nzdata nzwhich +#' @importFrom SparseArray nzwhich nzvals #' @importFrom DelayedArray start width setMethod("write_block", "TileDBRealizationSink", function(sink, viewport, block) { starts <- start(viewport) - 1L @@ -215,14 +215,8 @@ setMethod("write_block", "TileDBRealizationSink", function(sink, viewport, block on.exit(tiledb_array_close(obj)) if (sink@sparse) { - # Need this because COO_SparseArray doesn't support [. - if (is(block, "COO_SparseArray")) { - idx <- nzcoo(block) - vals <- nzdata(block) - } else { - idx <- nzwhich(block, arr.ind=TRUE) - vals <- block[idx] - } + idx <- nzwhich(block, arr.ind=TRUE) + vals <- nzvals(block) ndim <- ncol(idx) store <- vector("list", ndim + 1L)