Skip to content

Commit c404b07

Browse files
committed
Optimize get_class() function
1 parent fbaf698 commit c404b07

File tree

2 files changed

+7
-15
lines changed

2 files changed

+7
-15
lines changed

R/utils.R

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -284,12 +284,8 @@ na_as <- function(x) {
284284
}
285285

286286
get_class <- function(x) {
287-
foo <- function(x) {
288-
class(x)[1]
289-
}
290-
291-
if (is.list(x) || is.data.frame(x)) {
292-
vapply(x, foo, character(1))
287+
if (is.list(x)) {
288+
vapply(x, function(x) class(x)[1], character(1))
293289
} else {
294290
class(x)[1]
295291
}

tests/testthat/test-utils.R

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -338,17 +338,13 @@ test_that("na_as() | general test", {
338338
})
339339

340340
test_that("get_class() | general test", {
341-
foo <- function(x) {
342-
class(x)[1]
343-
}
341+
test <- function(x) class(x)[1]
344342

345343
expect_equal(get_class(1), "numeric")
346-
347-
x <- datasets::iris
348-
expect_equal(get_class(x), vapply(x, foo, character(1)))
349-
350-
x <- list(a = 1, b = 1)
351-
expect_equal(get_class(x), vapply(x, foo, character(1)))
344+
expect_equal(get_class(datasets::iris),
345+
vapply(datasets::iris, test, character(1)))
346+
expect_equal(get_class(list(a = 1, b = 1)),
347+
vapply(list(a = 1, b = 1), test, character(1)))
352348
})
353349

354350
test_that("fix_character() | general test", {

0 commit comments

Comments
 (0)