simplify agg filter

nmdefries · nmdefries · commit 3773570ac83a · 2021-09-16T11:04:39.000-04:00
diff --git a/facebook/delphiFacebook/R/responses.R b/facebook/delphiFacebook/R/responses.R
@@ -368,7 +368,7 @@ filter_data_for_aggregation <- function(df, params, lead_days = 12L)
                dplyr::between(.data$hh_number_total, 1L, 30L),
                .data$hh_number_sick <= .data$hh_number_total,
                .data$day >= (as.Date(params$start_date) - lead_days),
-               !(.data$wave %in% c(12.5)) # Ignore experimental Wave 12 data
+               !(.data$wave != 12.5) # Ignore experimental Wave 12 data
   )
 
   msg_plain(paste0("Finished filtering data for aggregations"))

Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ filter_data_for_aggregation <- function(df, params, lead_days = 12L)`
`368`	`368`	`dplyr::between(.data$hh_number_total, 1L, 30L),`
`369`	`369`	`.data$hh_number_sick <= .data$hh_number_total,`
`370`	`370`	`.data$day >= (as.Date(params$start_date) - lead_days),`
`371`		`- !(.data$wave %in% c(12.5)) # Ignore experimental Wave 12 data`
	`371`	`+ !(.data$wave != 12.5) # Ignore experimental Wave 12 data`
`372`	`372`	`)`
`373`	`373`
`374`	`374`	`msg_plain(paste0("Finished filtering data for aggregations"))`