Merge pull request #61 from n8thangreen/dev

fixed voi bug by putting in Suggests

CRAN-SUBMISSION

@@ -1,3 +1,3 @@
-Version: 2.4.4
+Version: 2.4.6
 Date: 2023-06-05 12:52:55 UTC
 SHA: 770d3d2d910eca75ebaaccf4c290c20e4668a95a

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: BCEA
 Type: Package
 Title: Bayesian Cost Effectiveness Analysis
-Version: 2.4.5
+Version: 2.4.6
 Authors@R: c(
     person("Gianluca", "Baio",
             email = "g.baio@ucl.ac.uk",
@@ -34,7 +34,6 @@ Imports:
     rlang,
     rstan,
     scales,
-    voi (>= 1.0.1)
 Depends:
     R (>= 3.5.0)
 Suggests:
@@ -51,6 +50,7 @@ Suggests:
     splancs,
     testthat (>= 2.1.0),
     vdiffr,
+    voi (>= 1.0.1),
     withr
 RdMacros: Rdpack
 VignetteBuilder: knitr
@@ -65,7 +65,7 @@ URL: https://gianluca.statistica.it/software/bcea/,
      https://gianluca.statistica.it/,
      https://github.com/giabaio/BCEA/  
 NeedsCompilation: no
-RoxygenNote: 7.2.3.9000
+RoxygenNote: 7.3.1
 Encoding: UTF-8
 BugReports: https://github.com/n8thangreen/BCEA/issues/
 LazyData: false

NAMESPACE

@@ -157,4 +157,3 @@ importFrom(utils,methods)
 importFrom(utils,modifyList)
 importFrom(utils,str)
 importFrom(utils,tail)
-importFrom(voi,evppi)

NEWS.md

@@ -1,4 +1,14 @@
 
+# BCEA 2.4.6
+
+_February 2024_
+
+Patch fixing small bugs from last CRAN release.
+
+* Converted help documentation in `man-roxygen` folder to md (cf858b1)
+* bugfix: line width in CEAC plot. `{ggplot2}` changed in version 3 to `linewidth` from `size` argument and had only changed some of the code. Updated to `scale_linewidth_manual()`. (60bea9c)
+* Using `testdata` folder `{testthat}` unit tests. (cbce0fa)
+
 # BCEA 2.4.5
 
 _November 2023_
@@ -14,6 +24,8 @@ _October 2023_
 Moved internal EVPPI calculation out of `BCEA` and now uses `voi` package instead. 
 Refactoring but retaining same interface and functionality.
 
+* Ensure using latest CRAN release of `{voi}` which has a patch so that BCEA can use it without losing functionality
+  + Latest version of `{voi}` needed when we use `check = TRUE` in `voi::evppi()` in order to access fitting data (6e436b5, 94f5fc5)
 * `evppi()` tested against all use cases in BCEA book (1c1457d2)
 * Select parameters by position (as well as name) in new `evppi()` (f2e4d005)
 * Use single parameter case only like `voi` package for methods `sal` and `so` (#140)
@@ -24,7 +36,7 @@ Refactoring but retaining same interface and functionality.
 # BCEA 2.4.4
 _June 2023_
 
-* Patch to fix a CRAN checks error. Suggested package `MCMCvis` wasn't used conditionally in unit test. Moved to Required packages in `DESCRIPTION`.
+* Patch to fix a CRAN checks error. Suggested package `{MCMCvis}` wasn't used conditionally in unit test. Moved to Required packages in `DESCRIPTION`.
 
 # BCEA 2.4.3
 _May 2023_

R/evppi.default.R

@@ -9,7 +9,6 @@ evppi.default <- function(he, ...) {
 
 #' @rdname evppi
 #'
-#' @importFrom voi evppi
 #' @examples
 #' data(Vaccine, package = "BCEA")
 #' treats <- c("Status quo", "Vaccination")
@@ -26,6 +25,13 @@ evppi.bcea <- function(he,
                        residuals = TRUE,
                        method = NULL, ...) {
 
+  if (!requireNamespace("voi", quietly = TRUE)) {
+    stop(
+      "Package \"voi (>= 1.0.1)\" must be installed to use this function.",
+      call. = FALSE
+    )
+  }
+
   comp_ids <- c(he$comp, he$ref)
   outputs <- list(e = he$e[, comp_ids],
                   c = he$c[, comp_ids],

cran-comments.md

@@ -3,5 +3,3 @@
 0 errors | 0 warnings | 0 note
 
 * This is an updated release.
-
-Previous versions depended directly on INLA which is now not the case