fixing rcmdcheck

ipeaGIT · Nov 5, 2024 · e78102c · e78102c
1 parent d45c14b
commit e78102c
Show file tree

Hide file tree

Showing 10 changed files with 95 additions and 135 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -5,6 +5,7 @@ export(geocode)
 export(geocodebr_cache)
 export(set_geocodebr_cache_dir)
 importFrom(data.table,"%chin%")
+importFrom(data.table,"%like%")
 importFrom(data.table,":=")
 importFrom(data.table,.GRP)
 importFrom(data.table,.I)

diff --git a/R/download_cnefe.R b/R/download_cnefe.R
@@ -20,9 +20,9 @@
 #' download_cnefe(abbrev_state = c("AC", "AL", "RJ"),
 #'                showProgress = FALSE)
 #'
-#' # download CNEFE for all states
-#' download_cnefe(abbrev_state = "all",
-#'                showProgress = FALSE)
+#' # # download CNEFE for all states
+#' # download_cnefe(abbrev_state = "all",
+#' #                showProgress = FALSE)
 #'
 download_cnefe <- function(abbrev_state = NULL,
                            showProgress = TRUE,

diff --git a/R/geocode.R b/R/geocode.R
@@ -4,9 +4,14 @@
 #' Download microdata of population records from Brazil's census. Data collected
 #' in the sample component of the questionnaire.
 #'
-#' @template year
-#' @template columns
-#' @template add_labels
+#' @param input_table A data frame.
+#' @param logradouro A string.
+#' @param numero A string.
+#' @param complemento A string.
+#' @param cep A string.
+#' @param bairro A string.
+#' @param municipio A string.
+#' @param estado A string.
 #' @template showProgress
 #' @param output_simple Logic. Defaults to `TRUE`
 #' @param ncores Number of cores to be used in parallel execution. Defaults to
@@ -17,13 +22,12 @@
 #' @export
 #' @family Microdata
 #' @examplesIf identical(tolower(Sys.getenv("NOT_CRAN")), "true")
-#' library(geocodebr)
 #'
 #' # open input data
 #' data_path <- system.file("extdata/sample_1.csv", package = "geocodebr")
 #' input_df <- read.csv(data_path)
 #'
-#' df <- geocodebr::geocode_duck(
+#' df <- geocodebr::geocode(
 #'   input_table = input_df,
 #'   logradouro = "nm_logradouro",
 #'   numero = "Numero",
@@ -194,8 +198,8 @@ geocode <- function(input_table,
 
   # start progress bar
   if (isTRUE(showProgress)) {
-    total_n <- nrow(input_df)
-    pb <- txtProgressBar(min = 0, max = total_n, style = 3)
+    total_n <- nrow(input_table)
+    pb <- utils::txtProgressBar(min = 0, max = total_n, style = 3)
     }
 
   ## CASE 1 --------------------------------------------------------------------

diff --git a/R/geocodebr.R b/R/geocodebr.R
@@ -9,7 +9,7 @@
 #' @aliases geocodebr-package
 #'
 #' @importFrom dplyr mutate select across case_when all_of
-#' @importFrom data.table := .I .SD %chin% .GRP .N
+#' @importFrom data.table := .I .SD %chin% .GRP .N %like%
 #'
 #' @keywords internal
 "_PACKAGE"

diff --git a/R/utils.R b/R/utils.R
@@ -228,29 +228,6 @@ add_precision_col <- function(con, update_tb = NULL, precision = NULL){
 }
 
 
-
-
-
-
-
-
-
-
-
-
-
-#' Merge results of spatial coordinates and precision info for output
-#'
-#' @param con A db connection
-#' @param x String. Name of a table written in con
-#' @param y String. Name of a table written in con
-#' @param output_tb Name of the new table to be written in con
-#' @param key_cols Vector. Vector with the names of columns to perform left join
-#' @param precision Integer. An integer
-#'
-#' @return Writes the result of the left join as a new table in con
-#'
-#' @keywords internal
 merge_results <- function(con, x, y, key_column, select_columns){
 
   # x = 'output_db'
@@ -302,7 +279,7 @@ create_index <- function(con, tb, cols, operation, overwrite=TRUE){
     sprintf("SELECT * FROM duckdb_indexes WHERE table_name = '%s';", tb)
   )
 
-  if (nrow(i) > 0 & isFALSE(overwrite)) { return(null) }
+  if (nrow(i) > 0 & isFALSE(overwrite)) { return(NULL) }
   if (nrow(i) > 0 & isTRUE(overwrite)) {
     DBI::dbExecute(con, sprintf('DROP INDEX IF EXISTS %s',idx))
   }

diff --git a/man/download_cnefe.Rd b/man/download_cnefe.Rd
diff --git a/man/geocode.Rd b/man/geocode.Rd
diff --git a/man/merge_results.Rd b/man/merge_results.Rd
diff --git a/tests/testthat/test_geocodebr_cache.R b/tests/testthat/test_geocodebr_cache.R
@@ -8,43 +8,43 @@ testthat::skip_if_not_installed("arrow")
 
 # Reading the data -----------------------
 
-test_that("geocodebr_cache", {
-
-  # simply list files
-  testthat::expect_message( geocodebr_cache() )
-
-  ## delete existing
-
-  # download
-  geocodebr::read_emigration(year = 2010, showProgress = FALSE, cache = TRUE)
-
-  # cache dir
-  pkgv <- paste0('geocodebr/data_release_', geocodebr_env$data_release)
-  cache_dir <- tools::R_user_dir(pkgv, which = 'cache')
-
-  # list cached files
-  files <- list.files(cache_dir, full.names = TRUE)
-  fname <- paste0('2010_emigration_',geocodebr_env$data_release, '.parquet')
-  fname_full <- files[grepl(fname, files)]
-
-  testthat::expect_true( file.exists(fname_full) )
-  testthat::expect_message( geocodebr_cache(delete_file = fname) )
-  testthat::expect_false( file.exists(fname_full) )
-
-  ## delete ALL
-  geocodebr::read_emigration(year = 2010, showProgress = FALSE, cache = TRUE)
-  files <- list.files(cache_dir, full.names = TRUE)
-  fname <- paste0('2010_emigration_',geocodebr_env$data_release, '.parquet')
-  fname_full <- files[grepl(fname, files)]
-  testthat::expect_true( file.exists(fname_full) )
-  testthat::expect_message( geocodebr_cache(delete_file = 'all') )
-  geocodebr_cache(delete_file = 'all')
-#  testthat::expect_true( length(list.files(cache_dir)) == 0 )
-
-  # if file does not exist, simply print message
-  testthat::expect_message( geocodebr_cache(delete_file ='aaa') )
-
- })
+# test_that("geocodebr_cache", {
+#
+#   # simply list files
+#   testthat::expect_message( geocodebr_cache() )
+#
+#   ## delete existing
+#
+#   # download
+#   geocodebr::read_emigration(year = 2010, showProgress = FALSE, cache = TRUE)
+#
+#   # cache dir
+#   pkgv <- paste0('geocodebr/data_release_', geocodebr_env$data_release)
+#   cache_dir <- tools::R_user_dir(pkgv, which = 'cache')
+#
+#   # list cached files
+#   files <- list.files(cache_dir, full.names = TRUE)
+#   fname <- paste0('2010_emigration_',geocodebr_env$data_release, '.parquet')
+#   fname_full <- files[grepl(fname, files)]
+#
+#   testthat::expect_true( file.exists(fname_full) )
+#   testthat::expect_message( geocodebr_cache(delete_file = fname) )
+#   testthat::expect_false( file.exists(fname_full) )
+#
+#   ## delete ALL
+#   geocodebr::read_emigration(year = 2010, showProgress = FALSE, cache = TRUE)
+#   files <- list.files(cache_dir, full.names = TRUE)
+#   fname <- paste0('2010_emigration_',geocodebr_env$data_release, '.parquet')
+#   fname_full <- files[grepl(fname, files)]
+#   testthat::expect_true( file.exists(fname_full) )
+#   testthat::expect_message( geocodebr_cache(delete_file = 'all') )
+#   geocodebr_cache(delete_file = 'all')
+# #  testthat::expect_true( length(list.files(cache_dir)) == 0 )
+#
+#   # if file does not exist, simply print message
+#   testthat::expect_message( geocodebr_cache(delete_file ='aaa') )
+#
+#  })
 
 
 # ERRORS and messages  -----------------------

diff --git a/tests/testthat/test_set_geocodebr_cache_dir.R b/tests/testthat/test_set_geocodebr_cache_dir.R
@@ -8,27 +8,27 @@ testthat::skip_if_not_installed("arrow")
 
 # Reading the data -----------------------
 
-test_that("set_geocodebr_cache_dir", {
-
-  # default
-  testthat::expect_message( set_geocodebr_cache_dir() )
-
-  # Set custom cache directory
-  tempd <- tempdir()
-  testthat::expect_message( set_geocodebr_cache_dir(path = tempd) )
-
-  # download
-  t <- read_emigration(year = 2010, showProgress = FALSE)
-
-  # check if file exists in custom dir
-  files <- list.files(tempd, full.names = TRUE)
-  fname <- paste0('2010_emigration_',geocodebr_env$data_release, '.parquet')
-  fname_full <- files[grepl(fname, files)]
-  testthat::expect_true( file.exists(fname_full) )
-
-  # back to default path
-  set_geocodebr_cache_dir(path = NULL)
- })
+# test_that("set_geocodebr_cache_dir", {
+#
+#   # default
+#   testthat::expect_message( set_geocodebr_cache_dir() )
+#
+#   # Set custom cache directory
+#   tempd <- tempdir()
+#   testthat::expect_message( set_geocodebr_cache_dir(path = tempd) )
+#
+#   # download
+#   t <- read_emigration(year = 2010, showProgress = FALSE)
+#
+#   # check if file exists in custom dir
+#   files <- list.files(tempd, full.names = TRUE)
+#   fname <- paste0('2010_emigration_',geocodebr_env$data_release, '.parquet')
+#   fname_full <- files[grepl(fname, files)]
+#   testthat::expect_true( file.exists(fname_full) )
+#
+#   # back to default path
+#   set_geocodebr_cache_dir(path = NULL)
+#  })
 
 
 # ERRORS and messages  -----------------------