Skip to content

Commit

Permalink
Closes #218 modified row merge (#219)
Browse files Browse the repository at this point in the history
* modified row merge
  • Loading branch information
nicholas-masel committed Mar 29, 2024
1 parent 700fe00 commit f618f59
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 3 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: logrx
Title: A Logging Utility Focus on Clinical Trial Programming Workflows
Version: 0.3.0
Version: 0.3.1
Authors@R:
c(
person(given = "Nathan",
Expand Down
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ importFrom(dplyr,group_by)
importFrom(dplyr,mutate)
importFrom(dplyr,rename_with)
importFrom(dplyr,select)
importFrom(dplyr,summarize)
importFrom(dplyr,ungroup)
importFrom(magrittr,"%>%")
importFrom(miniUI,gadgetTitleBar)
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@

# logrx 0.3.1

- Hotfix to update used and unapproved packages and functions writing (#218)

# logrx 0.3.0

- Moved website theme to bootstrap 5, enabled search (#179)
Expand Down
9 changes: 7 additions & 2 deletions R/writer.R
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ write_masked_functions <- function(){
#' @return Formatted vector of used package functions
#' @export
#'
#' @importFrom dplyr summarize
#' @importFrom purrr map2
#' @importFrom stats aggregate
#'
Expand All @@ -153,7 +154,9 @@ write_masked_functions <- function(){
write_used_functions <- function(){
used_functions_list <- get_log_element("used_packages_functions")

combined <- aggregate(function_name~library, used_functions_list, paste)
combined <- used_functions_list %>%
group_by(library) %>%
summarize(function_name = paste0(.data[["function_name"]], collapse = ", "))

map2(combined$library, combined$function_name, ~paste(paste0("{", .x, "}"), paste0(.y, collapse = ", "))) %>%
unname() %>%
Expand Down Expand Up @@ -183,7 +186,9 @@ write_unapproved_functions <- function(){
return("No unapproved packages or functions used")
}

combined <- aggregate(function_name~library, unapproved_functions_list, paste)
combined <- unapproved_functions_list %>%
group_by(library) %>%
summarize(function_name = paste0(.data[["function_name"]], collapse = ", "))

map2(combined$library, combined$function_name, ~paste(paste0("{", .x, "}"), paste0(.y, collapse = ", "))) %>%
unname() %>%
Expand Down

0 comments on commit f618f59

Please sign in to comment.