final attempt to make main stable fix #45

DESCRIPTION

@@ -14,6 +14,7 @@ RoxygenNote: 7.2.3
 Imports: 
     data.table,
     dplyr,
+    magrittr,
     srvyr,
     stats,
     stringr

NAMESPACE

@@ -1,5 +1,6 @@
 # Generated by roxygen2: do not edit by hand
 
+export("%>%")
 export(factorize_column)
 export(factorize_df)
 export(hts_bin_var)
@@ -20,6 +21,12 @@ export(hts_summary_num)
 export(hts_to_so)
 export(hts_trip_vehid)
 import(data.table)
-import(dplyr)
-import(srvyr)
-import(stats)
+importFrom(data.table,melt)
+importFrom(dplyr,group_by_at)
+importFrom(dplyr,summarize)
+importFrom(magrittr,"%>%")
+importFrom(srvyr,survey_mean)
+importFrom(srvyr,survey_median)
+importFrom(srvyr,survey_prop)
+importFrom(srvyr,survey_total)
+importFrom(stats,quantile)

R/hts_bin_var.R

@@ -8,7 +8,7 @@
 #' @export
 #'
 #'  
-#' @import stats
+#' @importFrom stats quantile
 #'  
 #' @examples
 #' 

R/hts_find_var.R

@@ -3,7 +3,7 @@
 #' @param var searchable variable in string format
 #' @param variables_dt codebook variable list in data table format
 #'
-#' @import data.table
+#' @importFrom data.table melt
 #'
 #' @return variable location in string format
 #' @export

R/hts_melt_vars.R

@@ -19,6 +19,8 @@
 #' @param to_single_row Boolean if treating multiple checkbox selections as 'Two
 #'  or more'. Defaults to FALSE.
 #'
+#' @import data.table
+#'  
 #' @return Inputted data table with checkbox variables melted into a single variable,
 #' with a 'variable' column to indicate original variable names and a 'value' column
 #' with the original value of the checkbox variable.

R/hts_summary_cat.R

@@ -14,8 +14,11 @@
 #' @param checkbox_yesval Value of checkbox_valname that indicates it was selected.
 #'  Default is NULL. Must be provided if summarize_var is a checkbox variable.
 #' 
-#' @import dplyr
-#' @import srvyr
+#' 
+#' @importFrom srvyr survey_prop
+#' @importFrom srvyr survey_total
+#' @importFrom dplyr summarize
+#' @importFrom dplyr group_by_at
 #'
 #' @return List of unweighted and weighted categorical summaries including counts
 #' and proportions.
@@ -290,5 +293,5 @@ hts_summary_cat = function(prepped_dt,
 }
 
 ## quiets concerns of R CMD check
-utils::globalVariables(c("value_labels", "prop", "est"))
+utils::globalVariables(c("value_labels", "prop", "est", "count"))
 

R/hts_summary_num.R

@@ -13,6 +13,11 @@
 #' when weighted = TRUE.
 #' @param strataname  Name of strata name to bring in. Default is NULL.
 #' 
+#' @importFrom srvyr survey_mean
+#' @importFrom srvyr survey_median
+#' @importFrom dplyr summarize
+#' @importFrom dplyr group_by_at
+#' 
 #' @return List of unweighted and weighted numeric summaries including count, min,
 #'  max, mean, se, and median.
 #' @export

R/hts_trip_vehid.R

@@ -70,5 +70,5 @@ before proceding.")
 }
 
 ## quiets concerns of R CMD check
-utils::globalVariables(c("value_labels", "vehicle_id", "mode_1", "mode_type"))
+utils::globalVariables(c("value_labels", "vehicle_id", "mode_1", "mode_type", "hh_id"))
 

R/utils-pipe.R

@@ -0,0 +1,14 @@
+#' Pipe operator
+#'
+#' See \code{magrittr::\link[magrittr:pipe]{\%>\%}} for details.
+#'
+#' @name %>%
+#' @rdname pipe
+#' @keywords internal
+#' @export
+#' @importFrom magrittr %>%
+#' @usage lhs \%>\% rhs
+#' @param lhs A value or the magrittr placeholder.
+#' @param rhs A function call using the magrittr semantics.
+#' @return The result of calling `rhs(lhs)`.
+NULL

tests/testthat/test_hts_filter_data.R

@@ -12,7 +12,7 @@ library(data.table)
     hts_data = test_data
 
     # Call the function to filter based on hh_id
-    result_hh = hts_filter_data(hts_data, hh[num_people > 5, hh_id], id_type = 'hh')
+    result_hh = hts_filter_data(hts_data, hh[num_people > 5, hh_id], id_name = 'hh')
 
     # Check if the result is a list
     expect_is(result_hh, "list", 

tests/testthat/test_hts_summary_num.R

@@ -4,6 +4,7 @@ context("Test suite for hts_summary_num function")
 # Load necessary libraries and setup environment
 library(testthat)
 library(data.table)
+library(srvyr)
 
 
 DT = hts_prep_data(summarize_var = 'speed_mph',

vignettes/getting_started.Rmd

@@ -111,6 +111,8 @@ In order to create summaries of our data we first need to prepare our data. We c
 ```{r, hts_prep_data, eval=TRUE, echo=TRUE }
 
 library(travelSurveyTools)
+library(data.table)
+library(srvyr)
 
 # Load data
 data("test_data")
@@ -264,7 +266,7 @@ DT = hts_prep_triprate(summarize_by = 'employment',
                                        'vehicle' = vehicle))
 
 trip_rate_by_employment_summary = hts_summary(prepped_dt = DT$num, 
-                                              summarize_var = 'num_trips',
+                                              summarize_var = 'num_trips_wtd',
                                               summarize_by = 'employment',
                                               summarize_vartype = 'numeric',
                                               weighted = TRUE,