tbl_df fix

CDCgov · Jul 18, 2024 · afe38a3 · afe38a3
1 parent 6336c17
commit afe38a3
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 10 deletions.
diff --git a/R/set_survey.R b/R/set_survey.R
@@ -90,6 +90,10 @@ set_survey = function(design, opts = "NCHS"
         , " (survey.design or svyrep.design) or a data.frame for an unweighted survey."
         , " Is: ", class(design)[1] ))
 
+  # get rid of non-`data.frame` classes (like tbl_df, tbl), which cause problems for some reason
+  assert_that(is.data.frame(design$variables))
+  design$variables %<>% as.data.frame()
+
   if(inherits(design, "svyrep.design") && !isTRUE(attr(design, "prob_set"))) {
     assert_that(!("prob" %in% names(design))
       , msg = "prob already exists")

diff --git a/R/z_data.R b/R/z_data.R
@@ -7,7 +7,7 @@
 #' `namcs2019sv_df` is a data frame.
 #'
 #' `namcs2019sv` is a survey object created from `namcs2019sv_df`
-#' using `[survey::svydesign()]`.
+#' using `survey::svydesign()`.
 #'
 #' @source
 #' * SAS data: <https://ftp.cdc.gov/pub/Health_Statistics/NCHS/Dataset_Documentation/NAMCS/sas/namcs2019_sas.zip>

diff --git a/docs/articles/Advanced-topics.html b/docs/articles/Advanced-topics.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -6,7 +6,7 @@ articles:
   Example-National-Ambulatory-Medical-Care-Survey-NAMCS-tables: Example-National-Ambulatory-Medical-Care-Survey-NAMCS-tables.html
   Example-Residential-Care-Community-Services-User-NSLTCP-RCC-SU-report: Example-Residential-Care-Community-Services-User-NSLTCP-RCC-SU-report.html
   surveytable: surveytable.html
-last_built: 2024-07-18T16:51Z
+last_built: 2024-07-18T20:49Z
 urls:
   reference: https://cdcgov.github.io/surveytable/reference
   article: https://cdcgov.github.io/surveytable/articles

diff --git a/docs/reference/namcs2019sv.html b/docs/reference/namcs2019sv.html
diff --git a/docs/search.json b/docs/search.json
diff --git a/man/namcs2019sv.Rd b/man/namcs2019sv.Rd
diff --git a/vignettes/Advanced-topics.Rmd b/vignettes/Advanced-topics.Rmd
@@ -87,7 +87,7 @@ Forwards flow:
 
 Backwards flow:
 
-* Going from (3) to (2): package users typically do not need to do this. 
+* Going from (3) to (2): you probably don't need this, but see below. If you really need this, call `surveytable:::.load_survey()`.
 * Going from (2) to (1): call `saveRDS()`. Normally, you probably don't want to do this. Normally, the survey file (`mysurvey.rds`) should probably not be changed. 
 
 The functions for modifying or creating variables that are part of the `surveytable` package (like `var_cut()` or `var_collapse()`) modify (3). Since (3) is what `surveytable` works with and tabulates, you can call `var_collapse()`, and then you can call `tab()`. You don't need to do anything extra in between. 
@@ -96,5 +96,5 @@ If you are modifying the `variables` data frame directly, you are actually modif
 
 Thus, any time you modify `variables` yourself, call `set_survey()`. You modify (2), then copy (2) -> (3) by calling `set_survey()`. 
 
-On the flip side, the changes that you make in (3) (using `surveytable` functions like `var_cut()` or `var_collapse()`) are not reflected in (2). If you make changes in (3), then call `set_survey()`, **those changes are lost**, because `set_survey()` copies (2) -> (3). If those changes were important, you can just rerun the code that created them. 
+On the flip side, the changes that you make in (3) (using `surveytable` functions like `var_cut()` or `var_collapse()`) are not reflected in (2). If you make changes in (3), then call `set_survey()`, **those changes are lost**, because `set_survey()` copies (2) -> (3). If those changes were important, you can just rerun the code that created them. If you really need to go from (3) to (2), use `mysurvey = surveytable:::.load_survey()`.