fix WHO API, update NEWS, DESCRIPTION

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: heemod
 Title: Markov Models for Health Economic Evaluations
-Version: 0.10.0.9000
+Version: 0.11.0
 Authors@R: c(
     person("Kevin", "Zarca", email = "[email protected]", role = c("aut", "cre")),
     person("Antoine", "Filipovic-Pierucci", role = "aut"),
@@ -50,7 +50,6 @@ Suggests:
     survival,
     testthat,
     triangle,
-    XLConnect,
     magrittr
 BugReports: https://github.com/pierucci/heemod/issues
 Roxygen: list(markdown = TRUE)

NEWS.md

@@ -1,4 +1,4 @@
-## heemod 0.10.9000
+## heemod 0.11.0
 
 ### Backend changes
 
@@ -7,6 +7,10 @@
     * starting_values: the state values when entering the state
 
   * Compatibility with dplyr 0.8: replaced all underscored (SE) versions of all verbs
+
+### Bugfixes
+
+  * `get_who_mr()` is again able to fetch data from GHO server
 
 ## heemod 0.10.0
 
@@ -82,7 +86,7 @@
 Filipovic-Pierucci A, Zarca K and Durand-Zaleski I (2017).
 “Markov Models for Health Economic Evaluations: The R
 Package heemod.” _ArXiv e-prints_. R package version
-0.8.0, 1702.03252, <URL: https://pierucci.org/heemod>.
+0.8.0, 1702.03252
 
   * Model calibration with `calibrate_model()`.
   * `init` and `inflow` can refer to values from `define_parameters()`, and are thus accessible to PSA / DSA.

R/gho_mortality.R

@@ -134,7 +134,7 @@ get_gho_mr <- function(sex, region, country, year) {
 
   mr_data_year <- mr_data[mr_data$YEAR == study_year, ]
 
-  if (nrow(mr_data_year) %% 44 != 0) {
+  if (nrow(mr_data_year) %% 38 != 0) {
     stop("Strange GHO mortality data.")
   }
 
@@ -166,7 +166,7 @@ pool_data <- function(mr_data, sex, region, country, year) {
   if (nrow(pop_data) == 0) {
     stop("No population structure for the selected year, cannot pool rates.")
   }
-  if (nrow(pop_data) %% 44 != 0) {
+  if (nrow(pop_data) %% 38 != 0) {
     stop("Strange population structure data.")
   }
   exists_col_country <- "COUNTRY" %in% colnames(pop_data)
@@ -175,7 +175,7 @@ pool_data <- function(mr_data, sex, region, country, year) {
   suppressMessages({
     pop_weight <- pop_data %>% 
       dplyr::select(
-        .dots = c(cols, weight = "Numeric")
+        c(cols, weight = "Numeric")
       ) %>% 
       dplyr::left_join(mr_data)
 

README.md

@@ -23,7 +23,7 @@ devtools::install_github("pierucci/heemod")
 Filipović-Pierucci A, Zarca K and Durand-Zaleski I (2017).
 [“Markov Models for Health Economic Evaluation: The R
 Package heemod.”](https://arxiv.org/abs/1702.03252) _ArXiv e-prints_. R package version
-0.8.0, 1702.03252, <URL: https://pierucci.org/heemod>.
+0.8.0, 1702.03252
 
 ## Features
 
@@ -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](https://pierucci.org).
+[Kevin Zarca](http://www.urc-eco.fr/Kevin-ZARCA,402) and Antoine Filipović-Pierucci.
 
 ## Contributors
 

cran-comments.md

@@ -1,6 +1,7 @@
 ## Test environments
-* local ubuntu 18.04 install, R 3.6.0
-* win-builder (devel and release)
+* local ubuntu 18.04 install, R 3.6.1
+* win-builder (devel, release and old-release)
+* r-hub (windows-server, Fedora Linux R-devel, clang, gfortran)
 
 ## R CMD check results