BREAKING CHANGE: remove data format argument (#100)

* BREAKING CHANGE: remove data format argument

* ...

* ...

Author: be-marc

DESCRIPTION

@@ -17,7 +17,7 @@ URL: https://mlr3spatial.mlr-org.com,
     https://github.com/mlr-org/mlr3spatial
 BugReports: https://github.com/mlr-org/mlr3spatial/issues
 Depends:
-    mlr3 (>= 0.14.0),
+    mlr3 (>= 1.1.0),
     R (>= 3.1.0)
 Imports:
     checkmate (>= 2.0.0),
@@ -49,7 +49,7 @@ Config/testthat/parallel: false
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.2
+RoxygenNote: 7.3.3
 Collate:
     'DataBackendRaster.R'
     'DataBackendVector.R'

R/DataBackendRaster.R

@@ -54,8 +54,6 @@ DataBackendRaster = R6Class("DataBackendRaster",
       private$.categories = terra::cats(data)
       private$.layer_names = names(data)
       private$.crs = terra::crs(data)
-
-      self$data_formats = "data.table"
     },
 
     #' @description
@@ -69,15 +67,11 @@ DataBackendRaster = R6Class("DataBackendRaster",
     #' Rows are guaranteed to be returned in the same order as `rows`, columns
     #' may be returned in an arbitrary order. Duplicated row ids result in
     #' duplicated rows, duplicated column names lead to an exception.
-    #'
-    #' @param data_format (`character(1)`)\cr
-    #'   Desired data format. Currently only `"data.table"` supported.
-    data = function(rows, cols, data_format = "data.table") {
+    data = function(rows, cols) {
       stack = self$stack
       if (is.null(rows)) rows = numeric(0)
       rows = assert_integerish(rows, coerce = TRUE, null.ok = TRUE)
       assert_names(cols, type = "unique")
-      assert_choice(data_format, self$data_formats)
       cols = intersect(cols, private$.layer_names)
 
       if (!length(cols)) {

R/DataBackendVector.R

@@ -18,7 +18,6 @@ DataBackendVector = R6::R6Class("DataBackendVector",
     #'   Name of the primary key column, or integer vector of row ids.
     initialize = function(data, primary_key) {
       assert_class(data, "sf")
-      self$data_formats = "data.table"
 
       # store geometry
       sf_column = attr(data, "sf_column")

man/DataBackendRaster.Rd

@@ -12,50 +12,50 @@ expect_backend = function(b) {
   rn1 = head(rn, 1L)
   pk = b$primary_key
 
-  x = b$data(rows = rn, cols = pk, data_format = "data.table")
+  x = b$data(rows = rn, cols = pk)
   checkmate::expect_data_table(x, ncols = 1L, nrows = n, col.names = "unique")
   x = x[[1L]]
   checkmate::expect_integerish(x, len = n, unique = TRUE)
 
-  x = b$data(rows = rn, cols = setdiff(cn, pk)[1L], data_format = "data.table")
+  x = b$data(rows = rn, cols = setdiff(cn, pk)[1L])
   checkmate::expect_data_table(x, ncols = 1L, nrows = n, col.names = "unique")
   x = x[[1L]]
   checkmate::expect_atomic_vector(x, len = n)
 
   # extra cols are ignored
-  x = b$data(rows = rn1, cols = c(cn[1L], "_not_existing_"), data_format = "data.table")
+  x = b$data(rows = rn1, cols = c(cn[1L], "_not_existing_"))
   checkmate::expect_data_table(x, nrows = length(rn1), ncols = 1L)
 
   # zero cols matching
-  x = b$data(rows = rn1, cols = "_not_existing_", data_format = "data.table")
+  x = b$data(rows = rn1, cols = "_not_existing_")
   checkmate::expect_data_table(x, nrows = 0L, ncols = 0L)
 
   # extra rows are ignored
   query_rows = c(rn1, if (is.integer(rn)) -1L else "_not_existing_")
-  x = b$data(query_rows, cols = cn[1L], data_format = "data.table")
+  x = b$data(query_rows, cols = cn[1L])
   checkmate::expect_data_table(x, nrows = length(rn1), ncols = 1L)
 
   # zero rows matching
   query_rows = if (is.integer(rn)) -1L else "_not_existing_"
-  x = b$data(rows = query_rows, cols = cn[1L], data_format = "data.table")
+  x = b$data(rows = query_rows, cols = cn[1L])
   checkmate::expect_data_table(x, nrows = 0L, ncols = 1L)
 
   # rows are duplicated
-  x = b$data(rows = rep(rn1, 2L), cols = b$colnames, data_format = "data.table")
+  x = b$data(rows = rep(rn1, 2L), cols = b$colnames)
   checkmate::expect_data_table(x, nrows = 2L * length(rn1), ncols = p)
 
   # cols are returned in the right order
   j = rev(cn)
-  x = b$data(rows = rn1, cols = j, data_format = "data.table")
+  x = b$data(rows = rn1, cols = j)
   testthat::expect_equal(j, colnames(x))
 
   # rows are returned in the right order
   i = sample(rn, min(n, 10L))
-  x = b$data(rows = i, cols = b$primary_key, data_format = "data.table")
+  x = b$data(rows = i, cols = b$primary_key)
   testthat::expect_equal(i, x[[1L]])
 
   # duplicated cols raise exception
-  testthat::expect_error(b$data(rows = rn1, cols = rep(cn[1L], 2L), data_format = "data.table"), "unique")
+  testthat::expect_error(b$data(rows = rn1, cols = rep(cn[1L], 2L)), "unique")
 
   # $head()
   checkmate::expect_data_table(b$head(.Machine$integer.max), nrows = n, ncols = p)