From 25fa9aa34c6a991eebf1ee8de320cedc763bf24f Mon Sep 17 00:00:00 2001 From: Mark Clements Date: Tue, 15 Sep 2020 22:31:56 +0200 Subject: [PATCH 1/7] Pass ... from bcea.plot to ceac.plot --- R/plot.bcea.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R/plot.bcea.R b/R/plot.bcea.R index fbe8113f..232f4e3c 100644 --- a/R/plot.bcea.R +++ b/R/plot.bcea.R @@ -95,7 +95,7 @@ plot.bcea <- function(x,comparison=NULL,wtp=25000,pos=FALSE,graph=c("base","ggpl op <- par(mfrow=c(2,2)) ceplane.plot(x,comparison=comparison,wtp=wtp,pos=pos,graph="base",...) eib.plot(x,comparison=comparison,pos=pos,graph="base",...) - ceac.plot(x,comparison=comparison,pos=pos,graph="base") + ceac.plot(x,comparison=comparison,pos=pos,graph="base",...) evi.plot(x,graph="base") par(op) } @@ -149,7 +149,7 @@ plot.bcea <- function(x,comparison=NULL,wtp=25000,pos=FALSE,graph=c("base","ggpl theme.multiplot eib <- eib.plot(x,pos=pos,comparison=comparison,graph="ggplot2",...) + theme.multiplot - ceac <- ceac.plot(x,pos=pos,comparison=comparison,graph="ggplot2") + + ceac <- ceac.plot(x,pos=pos,comparison=comparison,graph="ggplot2",...) + theme.multiplot evi <- evi.plot(x,graph="ggplot2") + theme.multiplot From 7a1c98ed1d8a845e07a423be6f697c4a1e87fd7e Mon Sep 17 00:00:00 2001 From: Gianluca Baio Date: Wed, 22 Feb 2023 15:54:11 +0000 Subject: [PATCH 2/7] Update README --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3cc80b78..cf330254 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ Install the released version from CRAN with install.packages("BCEA") ``` -The development version can be installed using this GitHub repository. On Windows machines, you need to install a few dependencies, including [Rtools](https://cran.r-project.org/bin/windows/Rtools/) first, e.g. by running +The stable version (which can be updated more quickly) can be installed using this GitHub repository. On Windows machines, you need to install a few dependencies, including [Rtools](https://cran.r-project.org/bin/windows/Rtools/) first, e.g. by running ```r pkgs <- c("MASS", "Rtools", "remotes") @@ -49,13 +49,13 @@ install.packages(pkgs, repos=repos, dependencies = "Depends") before installing the package using `remotes`: ```r -remotes::install_github("giabaio/BCEA", ref="dev") +remotes::install_github("giabaio/BCEA") ``` Under Linux or MacOS, it is sufficient to install the package via `remotes`: ```r install.packages("remotes") -remotes::install_github("giabaio/BCEA", ref="dev") +remotes::install_github("giabaio/BCEA") ``` ## Articles From 770d3d2d910eca75ebaaccf4c290c20e4668a95a Mon Sep 17 00:00:00 2001 From: Dr Nathan Green Date: Mon, 5 Jun 2023 13:49:21 +0100 Subject: [PATCH 3/7] fixed BCEA CRAN package canonical form web address in README --- CRAN-SUBMISSION | 6 +++--- DESCRIPTION | 2 +- NEWS.md | 5 +++++ README.md | 2 +- cran-comments.md | 28 ++-------------------------- 5 files changed, 12 insertions(+), 31 deletions(-) diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION index eefdb54a..bca6db49 100644 --- a/CRAN-SUBMISSION +++ b/CRAN-SUBMISSION @@ -1,3 +1,3 @@ -Version: 2.4.3 -Date: 2023-05-02 15:57:14 UTC -SHA: 849eaea3529ff1cdbddbd3e537c66e9b2da26194 +Version: 2.4.4 +Date: 2023-06-05 11:24:02 UTC +SHA: 315d3e90d9c230d5ea30b5e5540e1943398ab87e diff --git a/DESCRIPTION b/DESCRIPTION index d7855bf3..c4a6ea1d 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: BCEA Type: Package Title: Bayesian Cost Effectiveness Analysis -Version: 2.4.3 +Version: 2.4.4 Authors@R: c( person("Gianluca", "Baio", email = "g.baio@ucl.ac.uk", diff --git a/NEWS.md b/NEWS.md index 0cf2342b..6f6141d5 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,9 @@ +# 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`. + # BCEA 2.4.3 May 2023 diff --git a/README.md b/README.md index 4e1322ad..e5846e1f 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ Main features of `BCEA` include: * EVPPI calculations and plots ## Installation -Install the [released version from CRAN](https://cran.r-project.org/web/packages/BCEA/index.html) with +Install the [released version from CRAN](https://cran.r-project.org/package=BCEA) with ```r install.packages("BCEA") ``` diff --git a/cran-comments.md b/cran-comments.md index f010148c..8c485246 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,30 +1,8 @@ -# Resubmission (2.4.3) +# Resubmission (2.4.4) -* compute.evppi() was mismatched with the dplyr compute() function. We've changed the -function name to compute_evppi() to avoid confusion since it is only an internal function. +* Suggested package wasn't used conditionally in unit test causing CRAN check error. `MCMCvis` is now moved to Required packages. -CHECK message: - -Flavor: r-devel-linux-x86_64-debian-gcc -Check: S3 generic/method consistency, Result: NOTE - Mismatches for apparent methods not registered: - compute: - function(x, ...) - compute.evppi: - function(he, fit.full) - -* Similarly, the internal function plot.mesh() is not a plot method but was being considered so, -so we have renamed to plot_mesh() - -CHECK message: - - plot: - function(x, ...) - plot.mesh: - function(mesh, data, plot) - See section 'Registering S3 methods' in the 'Writing R Extensions' - manual. ## R CMD check results @@ -50,5 +28,3 @@ We checked 2 reverse dependencies (missingHE, heesim), comparing R CMD check res * We saw 0 new problems * We failed to check 0 packages - - From 2b0c3fd41ea53d8d14dca4fe851d43cb663d8e3a Mon Sep 17 00:00:00 2001 From: Dr Nathan Green Date: Sun, 9 Jul 2023 17:31:01 +0100 Subject: [PATCH 4/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 957c750b..c8c9c0b3 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ > Perform Bayesian Cost-Effectiveness Analysis in R. -:rocket: **Version 2.4.3 out now!** [Check out the release notes here](https://github.com/n8thangreen/BCEA/releases). +:rocket: **Version 2.4.4 out now!** [Check out the release notes here](https://github.com/n8thangreen/BCEA/releases). ## Contents From 8b19059fa3063b2c3be4f0be0333bc538fdc0efd Mon Sep 17 00:00:00 2001 From: Dr Nathan Green Date: Sun, 9 Jul 2023 17:31:39 +0100 Subject: [PATCH 5/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 957c750b..c8c9c0b3 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ > Perform Bayesian Cost-Effectiveness Analysis in R. -:rocket: **Version 2.4.3 out now!** [Check out the release notes here](https://github.com/n8thangreen/BCEA/releases). +:rocket: **Version 2.4.4 out now!** [Check out the release notes here](https://github.com/n8thangreen/BCEA/releases). ## Contents From 3e39323e164c89af3fd3daf416158ab1cba725fa Mon Sep 17 00:00:00 2001 From: Gianluca Baio Date: Mon, 10 Jul 2023 13:37:20 +0100 Subject: [PATCH 6/7] Update version in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3f228c43..a8827e60 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ > Perform Bayesian Cost-Effectiveness Analysis in R. -:rocket: **Version 2.4.3 out now!** [Check out the release notes here](https://github.com/n8thangreen/BCEA/releases). +:rocket: **Version 2.4.4 out now!** [Check out the release notes here](https://github.com/n8thangreen/BCEA/releases). ## Contents From e9781d961e1785eaa46a60780e195641cca2553e Mon Sep 17 00:00:00 2001 From: Dr Nathan Green Date: Thu, 28 Sep 2023 20:15:05 +0100 Subject: [PATCH 7/7] Update BCEA-package.R --- R/BCEA-package.R | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/R/BCEA-package.R b/R/BCEA-package.R index a65cf643..4b0fd1ac 100644 --- a/R/BCEA-package.R +++ b/R/BCEA-package.R @@ -1,3 +1,20 @@ +#------------------------------------------------------------------------------# +# +# ___ ___ ___ +# _____ / /\ / /\ / /\ +# / /::\ / /:/ / /:/_ / /::\ +# / /:/\:\ / /:/ / /:/ /\ / /:/\:\ +# / /:/~/::\ / /:/ ___ / /:/ /:/_ / /:/~/::\ +# /__/:/ /:/\:| /__/:/ / /\ /__/:/ /:/ /\ /__/:/ /:/\:\ +# \ \:\/:/~/:/ \ \:\ / /:/ \ \:\/:/ /:/ \ \:\/:/__\/ +# \ \::/ /:/ \ \:\ /:/ \ \::/ /:/ \ \::/ +# \ \:\/:/ \ \:\/:/ \ \:\/:/ \ \:\ +# \ \::/ \ \::/ \ \::/ \ \:\ +# \__\/ \__\/ \__\/ \__\/ +# +# +#------------------------------------------------------------------------------# + #' @keywords internal "_PACKAGE"