diff --git a/CRAN-RELEASE b/CRAN-RELEASE deleted file mode 100644 index c850b5b..0000000 --- a/CRAN-RELEASE +++ /dev/null @@ -1,2 +0,0 @@ -This package was submitted to CRAN on 2020-12-08. -Once it is accepted, delete this file and tag the release (commit 297b2a6). diff --git a/DESCRIPTION b/DESCRIPTION index f3d90e1..06ed4a7 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: heemod Title: Markov Models for Health Economic Evaluations -Version: 0.14.1 +Version: 0.14.2 Authors@R: c( person("Kevin", "Zarca", email = "kevin.zarca@gmail.com", role = c("aut", "cre")), person("Antoine", "Filipovic-Pierucci", role = "aut"), diff --git a/NEWS.md b/NEWS.md index c6a6814..2a17191 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -## heemod 0.14.1 +## heemod 0.14.2 * checks cairo_pdf availability ## heemod 0.14.0 diff --git a/R/tabular_input.R b/R/tabular_input.R index ebd67ae..4b5ea79 100644 --- a/R/tabular_input.R +++ b/R/tabular_input.R @@ -1231,15 +1231,13 @@ save_graph <- function(plot, path, file_name) { grDevices::png(filename = paste(full_file, "png", sep = ".")) print(plot) grDevices::dev.off() - pdf <- if(capabilities("cairo")){ - grDevices::cairo_pdf + filename <- paste(full_file, "pdf", sep = ".") + if(capabilities("cairo")){ + grDevices::cairo_pdf(filename = filename) } else { - grDevices::pdf + grDevices::pdf(file = filename) } - pdf( - filename = paste(full_file, "pdf", sep = ".") - ) - # print(plot) + print(plot) grDevices::dev.off() } diff --git a/cran-comments.md b/cran-comments.md index a46ce09..c3c95d6 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,8 +1,20 @@ ## Test environments -* local ubuntu 20.04 install, R 4.0.3 +* local ubuntu 20.10 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 NOTEs, ERRORs or WARNINGs. \ No newline at end of file +There were no ERRORs or WARNINGs. 1 NOTE: Possibly mis-spelled words in DESCRIPTION: + Siebert (17:5) + al (15:62, 17:20) + et (15:59, 17:17) + +CRAN repository db overrides: + X-CRAN-Comment: Archived on 2021-01-21 as check problems were not corrected in time. + +Dear Uwe, the m1MAC issue resolved; I'm trying to make the vignettes as least computing-intensive as possible +to reduce the overall check time, but I think that I need to learn C. + + + \ No newline at end of file diff --git a/vignettes/g_heterogeneity.Rmd b/vignettes/g_heterogeneity.Rmd index c056992..26d95b6 100644 --- a/vignettes/g_heterogeneity.Rmd +++ b/vignettes/g_heterogeneity.Rmd @@ -223,7 +223,7 @@ plot(res_h, type = "counts") Weights can be used in the analysis by including an optional column `.weights` in the new data to specify the respective weights of each strata in the target population. -```{r} +```{r, eval=FALSE} tab_indiv_w res_w <- update(res_mod, newdata = tab_indiv_w) res_w