Fix bug when all subjects experience event

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: joineR
 Type: Package
 Title: Joint Modelling of Repeated Measurements and Time-to-Event Data
-Version: 1.2.6
+Version: 1.2.7
 Authors@R: c(
  person("Pete", "Philipson", email = "[email protected]", 
  role = "aut",
@@ -62,4 +62,4 @@ Suggests:
  testthat,
  covr
 VignetteBuilder: knitr
-RoxygenNote: 7.1.1
+RoxygenNote: 7.1.2

NEWS.md

@@ -1,3 +1,9 @@
+# joineR 1.2.7
+
+## Bugs
+
+* Fixed bug for case when all subjects experience events.
+
 # joineR 1.2.6
 
 ## Bugs

R/prepSurvData.R

@@ -9,7 +9,7 @@ prepSurvData <- function(surv.formula, data, id, time.long) {
  } else if (ctest == 3) {
  compRisk <- TRUE
  message("Competing risks detected")
- } else if (ctest == 2) {
+ } else if (ctest == 2 | ctest == 1) {
  compRisk <- FALSE
  }
 

R/summary.jointdata.R

@@ -63,7 +63,7 @@ summary.jointdata <- function(object, ...) {
  out[[3]] <- paste0("No survival data available")
  } else {
  nn <- names(which(lapply(apply(object$survival, 2, unique), length) <= 3))
- if (length(unique(object$survival[[nn]])) == 2) {
+ if (length(unique(object$survival[[nn]])) %in% c(1L, 2L)) {
  out[[3]] <- data.frame(c(sum(object$survival[[nn]]), 
  sum(object$survival[[nn]] == 0)))
  row.names(out[[3]]) <- c("Number of subjects that fail:",

cran-comments.md

@@ -1,8 +1,8 @@
 ## Test environments
 
-* macOS-Catalina (local R installation), R 4.0.2
-* ubuntu-20.04 (via GitHub actions, release + devel), R 4.1.0
-* windows-latest (via GitHub actions, release), R 4.1.0
+* macOS-Big Sur (local R installation), R 4.1.2
+* ubuntu-20.04 (via GitHub actions, release + devel), R 4.1.2
+* windows-latest (via GitHub actions, release), R 4.1.2
 * macOS-latest (via GitHub actions, release)
 * win-builder (release)
 * win-builder (devel)