Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for dplyr 1.0.0 #460

Merged
merged 1 commit into from
Apr 3, 2020
Merged

Fix for dplyr 1.0.0 #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,16 @@ Imports:
tidyr,
survMisc,
purrr,
tibble
tibble,
rlang
Suggests:
knitr,
flexsurv,
cmprsk
VignetteBuilder: knitr
URL: http://www.sthda.com/english/rpkgs/survminer/
BugReports: https://github.com/kassambara/survminer/issues
RoxygenNote: 6.1.1
RoxygenNote: 7.1.0
Collate:
'BMT.R'
'BRCAOV.survInfo.R'
Expand Down
1 change: 1 addition & 0 deletions NAMESPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ importFrom(grDevices,axisTicks)
importFrom(magrittr,"%>%")
importFrom(methods,is)
importFrom(purrr,map)
importFrom(rlang,syms)
importFrom(stats,anova)
importFrom(stats,approx)
importFrom(stats,as.formula)
Expand Down
5 changes: 3 additions & 2 deletions R/surv_group_by.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ NULL
#' surv_group_by(grouping.vars = c("rx", "adhere"))
#' grouped.d
#'
#' @importFrom rlang syms
#' @export
#' @rdname surv_group_by
surv_group_by <- function(data, grouping.vars){
Expand All @@ -45,7 +46,7 @@ surv_group_by <- function(data, grouping.vars){

# Grouping the data ==> list of data sets
#::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
grouped.d <- dplyr::group_by_(.data = data, .dots = grouping.vars) %>%
grouped.d <- dplyr::group_by(.data = data, !!!syms(grouping.vars)) %>%
tidyr::nest()

# Ordering the grouped data by the original factor levels
Expand Down Expand Up @@ -77,5 +78,5 @@ surv_group_by <- function(data, grouping.vars){
}
names(grouped.d$data) <- .names

structure(grouped.d, class = c(class(grouped.d), "surv_group_by"))
structure(grouped.d, class = c("surv_group_by", class(grouped.d)))
}