update website & prepare for CRAN release

CRAN-RELEASE

@@ -1,2 +1,2 @@
-This package was submitted to CRAN on 2020-05-11.
-Once it is accepted, delete this file and tag the release (commit dbadec48d3).
+This package was submitted to CRAN on 2020-12-08.
+Once it is accepted, delete this file and tag the release (commit 297b2a6).

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: heemod
 Title: Markov Models for Health Economic Evaluations
-Version: 0.13.9000
+Version: 0.14.0
 Authors@R: c(
     person("Kevin", "Zarca", email = "[email protected]", role = c("aut", "cre")),
     person("Antoine", "Filipovic-Pierucci", role = "aut"),

NEWS.md

@@ -1,9 +1,11 @@
-## heemod 0.12.9000
-
-Prepare for dplyr 1.0.0
+## heemod 0.14.0
 
 ### Breaking changes
   * argument "method" for run_model was inverted. Now "beginning" overestimates costs and "end" underestimates costs (#345 @zaddyzad)
+
+## heemod 0.13.0
+
+Prepare for dplyr 1.0.0
 
 ### Bugfixes
   * Fix problem with state_time (fix #343 @Reale3)

R/tabular_input.R

@@ -2,7 +2,7 @@
 #' 
 #' This function runs a model from tabular input.
 #' 
-#' The reference file should have two columns, `data` 
+#' The reference file should have two columns. `data` 
 #' can be added, having value `TRUE` where an absolute 
 #' file path is provided. `data` values must include 
 #' `state`, `tm`, and `parameters`, and can 
@@ -17,7 +17,7 @@
 #' @param reference Name of the reference file.
 #' @param run_dsa Run DSA?
 #' @param run_psa Run PSA?.
-#' @param run_demo Run demgraphic analysis?
+#' @param run_demo Run demographic analysis?
 #' @param save Should the outputs be saved?
 #' @param overwrite Should the outputs be overwritten?
 #'   
@@ -377,8 +377,8 @@ create_model_list_from_tabular <- function(ref, df_env = globalenv()) {
 #' costs and utilities we want to keep track of, with 
 #' appropriate values (these may include parameters). For 
 #' any cost or utility that should be discounted, an 
-#' additional column with the name ".discount.<cost>" or 
-#' ".discount.<effect>", for the appropriate cost or effect,
+#' additional column with the name ".discount.\<cost\>" or 
+#' ".discount.\<effect\>", for the appropriate cost or effect,
 #' can be included. If no discounting is desired for a 
 #' particular cost or effect, the corresponding column can 
 #' be omitted.

README.md

@@ -1,6 +1,6 @@
 # heemod - Health Economic Evaluation MODelling
 
-[![Travis-CI Build Status](https://travis-ci.org/pierucci/heemod.svg?branch=devel)](https://travis-ci.org/pierucci/heemod) [![](http://www.r-pkg.org/badges/version/heemod)](http://www.r-pkg.org/pkg/heemod) 
+[![Travis-CI Build Status](https://travis-ci.org/pierucci/heemod.svg?branch=devel)](https://travis-ci.org/pierucci/heemod) [![](http://www.r-pkg.org/badges/version/heemod)](https://www.r-pkg.org/pkg/heemod) 
 
 Markov Models for Health Economic Evaluations. An implementation of the modelling and reporting features described in reference textbooks and guidelines: deterministic and probabilistic sensitivity analysis, heterogeneity analysis, time dependency on state-time and model-time (semi-Markov and non-homogeneous Markov models), etc.
 
@@ -55,7 +55,7 @@ To get started read the *An Introduction to `heemod`* vignette. Specific analysi
 
 ## Devs
 
-[Kevin Zarca](http://www.urc-eco.fr/Kevin-ZARCA,402) and Antoine Filipović-Pierucci.
+Kevin Zarca and Antoine Filipović-Pierucci.
 
 ## Contributors
 

cran-comments.md

@@ -1,8 +1,8 @@
 ## Test environments
-* local ubuntu 18.04 install, R 3.6.3
+* local ubuntu 20.04 install, R 4.0.3
 * win-builder (devel, release and old-release)
 * r-hub (windows-server, Fedora Linux R-devel, clang, gfortran)
 
 ## R CMD check results
 
-There were no ERRORs or WARNINGs. 
+There were no NOTEs, ERRORs or WARNINGs.