Fixes for all the things

kosukeimai · Feb 14, 2024 · 7541cbb · 7541cbb
1 parent 9d8626a
commit 7541cbb
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -16,3 +16,4 @@ Date        Version  Comment
 2022-06-17  1.0.0    Updates to BISG, inclusion of fBISG and other package improvements
 2022-10-04  1.0.1    Bug fixes for census url and census year
 2023-06-12  2.0.0    Updated defaults to 2020 data, specifiy as next major version 2.0.
+2024-02-15  3.0.0    Adding back age and sex functionality. Other improvements. 
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -2,7 +2,7 @@ Package: wru
 Title: Who are You? Bayesian Prediction of Racial Category Using Surname,
     First Name, Middle Name, and Geolocation
 Version: 3.0.0
-Date: 2023-12-09
+Date: 2024-02-14
 Authors@R: c(
     person("Kabir", "Khanna", , "[email protected]", role = "aut"),
     person("Brandon", "Bertelsen", , "[email protected]", role = c("aut", "cre")),

diff --git a/NAMESPACE b/NAMESPACE
@@ -1,5 +1,7 @@
 # Generated by roxygen2: do not edit by hand
 
+export(as_fips_code)
+export(as_state_abbreviation)
 export(format_legacy_data)
 export(get_census_data)
 export(predict_race)

diff --git a/R/census_helper_v2.R b/R/census_helper_v2.R
@@ -211,10 +211,13 @@ census_helper_new <- function(
            paste(do.call(paste, c(unique(voters.census[miss_ind, c("state",geo.merge)]),
                                   sep="-")),
                  collapse = ", "))
-      if(skip_bad_geos == TRUE){
+      if(skip_bad_geos == TRUE) {
         message("NOTE: Skipping unavailable geolocations. Returning partial data set.")
-      voters.census <- tidyr::drop_na(voters.census, r_whi)}
-      else(stop("Stopping predictions. Please revise census data and/or verify the correct year is being supplied. To skip these rows use 'skip_bad_geos = TRUE'"))
+        voters.census <- voters.census[!is.na(voters.census$r_whi),]
+      }
+      else {
+        stop("Stopping predictions. Please revise census data and/or verify the correct year is being supplied. To skip these rows use 'skip_bad_geos = TRUE'")
+      }
     }
 
     # }

diff --git a/R/utils_state_fips.R b/R/utils_state_fips.R
@@ -52,7 +52,9 @@
 #' as_state_abbreviation(c("utah", "NM", 8, "04"))
 #'
 #' @keywords internal
+#' @export
 as_fips_code <- function(x) {
+  state_fips <- wru::state_fips
   state_fips$state_code[
     dplyr::coalesce(
       match(toupper(x), state_fips$state),
@@ -63,7 +65,9 @@ as_fips_code <- function(x) {
 }
 
 #' @rdname as_fips_code
+#' @export
 as_state_abbreviation <- function(x) {
+  state_fips <- wru::state_fips
   state_fips$state[
     dplyr::coalesce(
       match(toupper(x), state_fips$state),

diff --git a/R/wru-internal.R b/R/wru-internal.R
@@ -2,7 +2,7 @@
   packageStartupMessage(
     "\n",
     "Please cite as:", "\n\n",
-    format(citation("wru"), style = "text"), "\n\n",
+    format(utils::citation("wru"), style = "text"), "\n\n",
     "Note that wru 2.0.0 uses 2020 census data by default.", "\n",
     'Use the argument `year = "2010"`, to replicate analyses produced with earlier package versions.',
     "\n"