Skip to content

Commit e2b9baa

Browse files
authored
audit uses of tibble() and as_tibble() (#923)
1 parent fa741d9 commit e2b9baa

File tree

1 file changed

+17
-19
lines changed

1 file changed

+17
-19
lines changed

R/aaa_models.R

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -560,38 +560,38 @@ set_new_model <- function(model) {
560560
current <- get_model_env()
561561

562562
set_env_val("models", unique(c(current$models, model)))
563-
set_env_val(model, dplyr::tibble(engine = character(0), mode = character(0)))
563+
set_env_val(model, tibble::new_tibble(list(engine = character(0), mode = character(0))))
564564
set_env_val(
565565
paste0(model, "_pkgs"),
566-
dplyr::tibble(engine = character(0), pkg = list(), mode = character(0))
566+
tibble::new_tibble(list(engine = character(0), pkg = list(), mode = character(0)))
567567
)
568568
set_env_val(paste0(model, "_modes"), "unknown")
569569
set_env_val(
570570
paste0(model, "_args"),
571-
dplyr::tibble(
571+
tibble::new_tibble(list(
572572
engine = character(0),
573573
parsnip = character(0),
574574
original = character(0),
575575
func = list(),
576576
has_submodel = logical(0)
577-
)
577+
))
578578
)
579579
set_env_val(
580580
paste0(model, "_fit"),
581-
dplyr::tibble(
581+
tibble::new_tibble(list(
582582
engine = character(0),
583583
mode = character(0),
584584
value = list()
585-
)
585+
))
586586
)
587587
set_env_val(
588588
paste0(model, "_predict"),
589-
dplyr::tibble(
589+
tibble::new_tibble(list(
590590
engine = character(0),
591591
mode = character(0),
592592
type = character(0),
593593
value = list()
594-
)
594+
))
595595
)
596596

597597
invisible(NULL)
@@ -630,7 +630,7 @@ set_model_engine <- function(model, mode, eng) {
630630
check_eng_val(eng)
631631
check_mode_for_new_engine(model, eng, mode)
632632

633-
new_eng <- dplyr::tibble(engine = eng, mode = mode)
633+
new_eng <- tibble::new_tibble(list(engine = eng, mode = mode), nrow = 1)
634634
old_eng <- get_from_env(model)
635635

636636
engs <-
@@ -659,13 +659,13 @@ set_model_arg <- function(model, eng, parsnip, original, func, has_submodel) {
659659
old_args <- get_from_env(paste0(model, "_args"))
660660

661661
new_arg <-
662-
dplyr::tibble(
662+
tibble::new_tibble(list(
663663
engine = eng,
664664
parsnip = parsnip,
665665
original = original,
666666
func = list(func),
667667
has_submodel = has_submodel
668-
)
668+
), nrow = 1)
669669

670670
updated <- try(dplyr::bind_rows(old_args, new_arg), silent = TRUE)
671671
if (inherits(updated, "try-error")) {
@@ -838,11 +838,11 @@ set_fit <- function(model, mode, eng, value) {
838838
check_unregistered(model, mode, eng)
839839

840840
new_fit <-
841-
dplyr::tibble(
841+
tibble::new_tibble(list(
842842
engine = eng,
843843
mode = mode,
844844
value = list(value)
845-
)
845+
), nrow = 1)
846846

847847
if (!is_discordant_info(model, mode, eng, new_fit)) {
848848
return(invisible(NULL))
@@ -889,11 +889,9 @@ set_pred <- function(model, mode, eng, type, value) {
889889
model_info <- get_from_env(model)
890890

891891
new_pred <-
892-
dplyr::tibble(
893-
engine = eng,
894-
mode = mode,
895-
type = type,
896-
value = list(value)
892+
tibble::new_tibble(
893+
list(engine = eng, mode = mode, type = type, value = list(value)),
894+
nrow = 1
897895
)
898896

899897
pred_check <- is_discordant_info(model, mode, eng, new_pred, pred_type = type, component = "predict")
@@ -1089,7 +1087,7 @@ set_encoding <- function(model, mode, eng, options) {
10891087
check_mode_val(mode)
10901088
check_encodings(options)
10911089

1092-
keys <- tibble::tibble(model = model, engine = eng, mode = mode)
1090+
keys <- tibble::new_tibble(list(model = model, engine = eng, mode = mode), nrow = 1)
10931091
options <- tibble::as_tibble(options)
10941092
new_values <- dplyr::bind_cols(keys, options)
10951093

0 commit comments

Comments
 (0)