Merge pull request #83 from AstraZeneca/hce_update_fix

Hce update fix

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: maraca
-Version: 0.5.0
+Version: 0.5.1
 Type: Package
 Title: The Maraca Plot: Visualization of Hierarchical Composite Endpoints in Clinical Trials
 License: Apache License (>= 2)
@@ -12,7 +12,8 @@ Description: Library that supports visual interpretation of hierarchical composi
     endpoints (HCEs). HCEs are complex constructs used as primary endpoints in
     clinical trials, combining outcomes of different types into ordinal endpoints,
     in which each patient contributes the most clinically important event (one and
-    only one) to the analysis.
+    only one) to the analysis. See Karpefors M et al. (2022)
+    <doi:10.1177/17407745221134949>.
 URL: https://github.com/AstraZeneca/maraca
 BugReports: https://github.com/AstraZeneca/maraca/issues
 Encoding: UTF-8

NEWS.md

@@ -1,3 +1,10 @@
+# maraca 0.5.1
+
+## Bug fixes
+
+- Small bug fix to account for changes in HCE objects created in newest
+  version of HCE package
+
 # maraca 0.5.0
 
 ## New features

R/general.R

@@ -2,6 +2,7 @@
 #'
 #' @docType package
 #' @name maraca
+#' @aliases maraca-package
 NULL
 
 #' Example HCE scenario A.

R/maraca.R

@@ -624,6 +624,12 @@ plot.hce <- function(x, continuous_outcome = "C",
   x <- as.data.frame(x)
   TTE <- sort(unique(x$GROUP)[unique(x$GROUP) != continuous_outcome])
 
+  # Small bugfix to allow for name change of variable TTEFixed in newer
+  # version of HCE package
+  if ("PADY" %in% names(x)) {
+    x$TTEfixed <- x$PADY
+  }
+
   if (is.null(fixed_followup_days)) {
     checkmate::assertNames(names(x), must.include = "TTEfixed")
     checkmate::assert_int(x$TTEfixed[[1]])

tests/testthat/test_maraca.R

@@ -1018,4 +1018,15 @@ test_that("plotHCE", {
   set_pdf_output(output)
   plot(HCE, fixed_followup_days = 6 * 365)
   expect_file_exists(output)
+
+  if (!("PADY" %in% names(HCE))) {
+    HCE$PADY <- HCE$TTEfixed
+  }
+  HCE$TTEfixed <- NULL
+  output <- artifacts_path("plotHCE-newVersionHCEpkg.pdf")
+  expect_file_not_exists(output)
+  set_pdf_output(output)
+  plot(HCE)
+  expect_file_exists(output)
+
 })