Merge pull request #18 from n8thangreen/dev

main repo update

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: BCEA
 Type: Package
 Title: Bayesian Cost Effectiveness Analysis
-Version: 2.3-2
-Date: 2020-01-30
+Version: 2.4
+Date: 2020-07-21
 Authors@R: c(
     person("Gianluca", "Baio",
             email = "[email protected]",
@@ -11,6 +11,9 @@ Authors@R: c(
             email = "[email protected]",
             role = c("aut")),
     person("Anna", "Heath",
+            email = "[email protected]",
+            role = c("aut")),
+    person("Nathan", "Green",
             email = "[email protected]",
             role = c("aut")))
 Imports:

R/BCEA-package.R

@@ -5,7 +5,7 @@
 #' and produce standardised output for the analysis of the results  
 #' 
 #' \tabular{ll}{ Package: \tab BCEA\cr Type: \tab Package\cr Version: \tab
-#' 2.3-00\cr Date: \tab 2019-03-27\cr License: \tab GPL2 \cr LazyLoad: \tab
+#' 2.4\cr Date: \tab 2020-07-21\cr License: \tab GPL2 \cr LazyLoad: \tab
 #' yes\cr } Given the results of a Bayesian model (possibly based on MCMC) in
 #' the form of simulations from the posterior distributions of suitable
 #' variables of costs and clinical benefits for two or more interventions,

R/ceac.plot.R

@@ -102,4 +102,4 @@ ceac.plot <- function(he,
     ##TODO:
     # ceac_plot_plotly()
   }
-}
+}

README.md

@@ -1,8 +1,7 @@
-# BCEA
+# BCEA --- development version
 
 <!-- badges: start -->
-
-[![Build status](https://img.shields.io/travis/giabaio/BCEA/master.svg?maxAge=0)](https://travis-ci.org/giabaio/BCEA) [![AppVeyor Build Status](https://img.shields.io/appveyor/ci/giabaio/BCEA/master.svg)](https://ci.appveyor.com/project/giabaio/BCEA) [![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/BCEA)](https://cran.r-project.org/package=BCEA) [![CRAN_Download_Badge](http://cranlogs.r-pkg.org/badges/BCEA)](https://cran.r-project.org/package=BCEA) [![CRAN_Download_Badge](http://cranlogs.r-pkg.org/badges/grand-total/BCEA?color=orange)](	)
+<!-- [![Build status](https://img.shields.io/travis/giabaio/BCEA/master.svg?maxAge=0)](https://travis-ci.org/giabaio/BCEA) [![AppVeyor Build Status](https://img.shields.io/appveyor/ci/giabaio/BCEA/master.svg)](https://ci.appveyor.com/project/giabaio/BCEA) [![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/BCEA)](https://cran.r-project.org/package=BCEA) [![CRAN_Download_Badge](http://cranlogs.r-pkg.org/badges/BCEA)](https://cran.r-project.org/package=BCEA) [![CRAN_Download_Badge](http://cranlogs.r-pkg.org/badges/grand-total/BCEA?color=orange)](	) -->
 <!-- badges: end -->
 
 ## Contents
@@ -25,29 +24,26 @@ Main features of `BCEA` include:
 * Cost-effectiveness analysis plots, such as CE planes and CEAC
 * EVPPI calculations and plots
 
-## Installation
-There are two ways of installing `BCEA`. A "stable" version (currently 2.2.6) is packaged and available from [CRAN](https://cran.r-project.org/index.html). So you can simply type on your R terminal
+This is the **development** version of BCEA (currently 2.4). It contains a major refactoring of the code to streamline the functions.
 
-```r
-install.packages("BCEA")
-```
-The second way involves using the "development" version of `BCEA` - this will usually be updated more frequently and may be continuously tested. 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
+## Installation
+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
 
-```r
-pkgs <- c("MASS", "Rtools", "devtools")
-repos <- c("https://cran.rstudio.com", "https://www.math.ntnu.no/inla/R/stable") 
-install.packages(pkgs, repos = repos, dependencies = "Depends")
+```R
+pkgs <- c("MASS","Rtools","devtools")
+repos <- c("https://cran.rstudio.com", "https://inla.r-inla-download.org/R/stable") 
+install.packages(pkgs,repos=repos,dependencies = "Depends")
 ```
 before installing the package using `devtools`:
 
 ```r
-devtools::install_github("giabaio/BCEA")
+devtools::install_github("giabaio/BCEA",ref="dev")
 ```
 Under Linux or MacOS, it is sufficient to install the package via `devtools`:
 
 ```r
 install.packages("devtools")
-devtools:install_github("giabaio/BCEA")
+devtools:install_github("giabaio/BCEA",ref="dev")
 ```
 
 ## Further details