From 07c0fb38189c89d6ccca9cf6d971f37ce1ebfdaf Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Tue, 11 Jul 2023 08:34:17 -0500 Subject: [PATCH] Convert four uses of as.data.frame to return_as="data.frame" --- R/DataFrame.R | 8 ++++---- R/SparseMatrix.R | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/R/DataFrame.R b/R/DataFrame.R index f98e563079..f3f816610f 100644 --- a/R/DataFrame.R +++ b/R/DataFrame.R @@ -76,7 +76,7 @@ ##' ## turn factor into character ##' irisdf <- within(iris, Species <- as.character(Species)) ##' fromDataFrame(irisdf, uri) -##' arr <- tiledb_array(uri, as.data.frame=TRUE, sparse=FALSE) +##' arr <- tiledb_array(uri, return_as="data.frame", sparse=FALSE) ##' newdf <- arr[] ##' all.equal(iris, newdf) ##' } @@ -265,7 +265,7 @@ fromDataFrame <- function(obj, uri, col_index=NULL, sparse=TRUE, allows_dups=spa if (dir.exists(uri)) unlink(uri, recursive=TRUE) fromDataFrame(obj, uri) - df <- tiledb_array(uri, as.data.frame=TRUE) + df <- tiledb_array(uri, return_as="data.frame") df[] } @@ -292,7 +292,7 @@ fromDataFrame <- function(obj, uri, col_index=NULL, sparse=TRUE, allows_dups=spa } fromDataFrame(bkdf, uri) - arr <- tiledb_array(uri, as.data.frame = TRUE) + arr <- tiledb_array(uri, return_as="data.frame") newdf <- arr[] invisible(newdf) } @@ -305,7 +305,7 @@ fromDataFrame <- function(obj, uri, col_index=NULL, sparse=TRUE, allows_dups=spa fromDataFrame(df, uri) cat("Data written\n") - arr <- tiledb_array(uri, as.data.frame = TRUE) + arr <- tiledb_array(uri, return_as="data.frame") newdf <- arr[] invisible(newdf) } diff --git a/R/SparseMatrix.R b/R/SparseMatrix.R index 3101ac06b8..20f73f373a 100644 --- a/R/SparseMatrix.R +++ b/R/SparseMatrix.R @@ -112,7 +112,7 @@ fromSparseMatrix <- function(obj, toSparseMatrix <- function(uri) { stopifnot(`Argument 'uri' must be character` = is.character(uri)) - arr <- tiledb_array(uri, as.data.frame=TRUE, query_layout="UNORDERED") + arr <- tiledb_array(uri, return_as="data.frame", query_layout="UNORDERED") obj <- arr[] dimnm <- list(NULL, NULL) # by default no dimnames