Review of Joanna testing

R/estimate_KM.R

@@ -123,11 +123,11 @@ estimate_KM <- function(
 
 # Remove NA from the analysis --------------------------------------------
 
-  data <- as.data.frame(data)%>%
-    tidyr::drop_na(AVAL, CNSR, strata)
+  data <- as.data.frame(data) %>%
+    tidyr::drop_na(AVAL, CNSR)
 
   if (!is.null(strata)){
-    data <- data%>%
+    data <- data %>%
       tidyr::drop_na(any_of({{strata}}))
   }
 

R/estimate_cuminc.R

@@ -20,29 +20,64 @@
 #' @export
 #'
 #' @examples
-#' estimate_cuminc(
-#'   tidycmprsk::trial,
-#'   strata = "trt",
-#'   CNSR = "death_cr",
-#'   AVAL = "ttdeath"
-#' ) %>%
-#'   visr() %>%
-#'   add_CI() %>%
-#'   add_risktable(statlist = c("n.risk", "cum.event"))
-
-estimate_cuminc <- function(data
+#' cuminc <-
+#'   visR::estimate_cuminc(
+#'     data = tidycmprsk::trial,
+#'     strata = "trt",
+#'     CNSR = "death_cr",
+#'     AVAL = "ttdeath"
+#'   )
+#' cuminc
+#'
+#' cuminc %>%
+#'   visR::visr() %>%
+#'   visR::add_CI() %>%
+#'   visR::add_risktable(statlist = c("n.risk", "cum.event"))
+
+estimate_cuminc <- function( data = NULL
                             ,strata = NULL
                             ,CNSR = "CNSR"
                             ,AVAL = "AVAL"
                             ,conf.int = 0.95
                             ,...) {
-  # check for installation of tidycmprsk package
+
+
+  # check for installation of tidycmprsk package -------------------------
   rlang::check_installed("tidycmprsk", version = "0.1.1")
   dots <- rlang::dots_list(...)
 
-  # checking/prepping inputs ---------------------------------------------------
-  strata <- strata %||% "1" %>% paste(collapse = " + ")
+  # Validate data --------------------------------------------------------
+  if (is.null(data)) stop(paste0("Data can't be NULL."))
+
+  # Validate columns -----------------------------------------------------
+  reqcols <- c(strata, CNSR, AVAL)
+
+  if (! all(reqcols %in% colnames(data))){
+    stop(paste0("Following columns are missing from `data`: ", paste(setdiff(reqcols, colnames(data)), collapse = " "), "."))
+  }
+
+  if (! is.numeric(data[[AVAL]])){
+    stop("Analysis variable (AVAL) is not numeric.")
+  }
+
+  if (! is.factor(data[[CNSR]])){
+    stop("Censor variable (CNSR) is not a factor")
+  }
+
+  # Remove NA from the analysis ------------------------------------------
+
+  data <- data %>%
+    tidyr::drop_na(AVAL, CNSR)
+
+  if (!is.null(strata)){
+    data <- data %>%
+      tidyr::drop_na(any_of({{strata}}))
+  }
+
+  # Ensure the presence of at least one strata ---------------------------
+  strata <- ifelse(is.null(strata), 1, strata %>% paste(collapse = " + "))
 
+  # cuminc ---------------------------------------------------------------
   cuminc <-
     tidycmprsk::cuminc(
       formula = stats::as.formula(paste0("survival::Surv(", AVAL, ", ", CNSR, ") ~ ", strata)),

R/utils_visr.R

@@ -6,16 +6,15 @@
 #'
 #' @return List of \code{ggplot} with equal width.
 #'
-#' @references \url{https://stackoverflow.com/questions/26159495/align-multiple-ggplot-
-#'                  graphs-with-and-without-legends}
+#' @references \url{https://stackoverflow.com/questions/26159495}
 #'
 #' @examples
 #' \donttest{
 #'
 #' ## create 2 graphs
 #' p1 <- ggplot2::ggplot(adtte, ggplot2::aes(x = as.numeric(AGE), fill = "Age")) +
 #'   ggplot2::geom_histogram(bins = 15)
-#'   
+#'
 #' p2 <- ggplot2::ggplot(adtte, ggplot2::aes(x = as.numeric(AGE))) +
 #'  ggplot2::geom_histogram(bins = 15)
 #'

README.md

@@ -44,7 +44,7 @@ coverage](https://codecov.io/gh/openpharma/visR/branch/develop/graph/badge.svg)]
 [![pkgdown](https://github.com/openpharma/visR/actions/workflows/makedocs.yml/badge.svg)](https://github.com/openpharma/visR/actions/workflows/makedocs.yml)
 [![CRAN
 status](https://www.r-pkg.org/badges/version/visR)](https://CRAN.R-project.org/package=visR)
-<a href=https://github.com/pharmaR/riskmetric><img src=https://img.shields.io/badge/riskmetric-0.53-green></img></a>
+<a href=https://github.com/pharmaR/riskmetric><img src=https://img.shields.io/badge/riskmetric-0.52-green></img></a>
 <!-- badges: end -->
 
 ## Installation
@@ -114,6 +114,7 @@ agree to abide by its terms. Thank you to all contributors:
 [@ddsjoberg](https://github.com/ddsjoberg),
 [@epijim](https://github.com/epijim),
 [@gdario](https://github.com/gdario),
+[@joanacmbarros](https://github.com/joanacmbarros),
 [@lcomm](https://github.com/lcomm),
 [@prabhushanmup](https://github.com/prabhushanmup),
 [@rebecca-albrecht](https://github.com/rebecca-albrecht),

_pkgdown.yml

@@ -11,6 +11,8 @@ authors:
     href: "https://www.linkedin.com/in/stevenhaesendonckx/"
   James Black:
     href: "https://www.epijim.uk/"
+  Daniel D. Sjoberg:
+    href: "https://www.danieldsjoberg.com/"
 
 development:
   mode: auto