From cb53f93e27f80beee64f7a89792a7703375865d3 Mon Sep 17 00:00:00 2001 From: Delaigue Olivier <olivier.delaigue@irstea.fr> Date: Fri, 7 Apr 2023 09:39:40 +0200 Subject: [PATCH] fix: remove 'Rmalschains' from the 'Suggests' list - avoid Error because the package is removed from the CRAN - silenced the package in the 'param_optim' vignette Refs: #172 --- DESCRIPTION | 2 +- vignettes/V02.1_param_optim.Rmd | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 9a698c67..fa95aeb6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -28,7 +28,7 @@ Imports: utils Suggests: knitr, markdown, rmarkdown, - caRamel, coda, DEoptim, FME, ggmcmc, hydroPSO, Rmalschains, + caRamel, coda, DEoptim, FME, ggmcmc, hydroPSO, GGally, ggplot2, testthat Description: Hydrological modelling tools developed at INRAE-Antony (HYCAR Research Unit, France). The package includes several conceptual rainfall-runoff models (GR4H, GR5H, GR4J, GR5J, GR6J, GR2M, GR1A) that can be applied either on a lumped or semi-distributed way. A snow accumulation and melt model (CemaNeige) and the associated functions for the calibration and evaluation of models are also included. Use help(airGR) for package description and references. diff --git a/vignettes/V02.1_param_optim.Rmd b/vignettes/V02.1_param_optim.Rmd index 7ded6941..717253c1 100644 --- a/vignettes/V02.1_param_optim.Rmd +++ b/vignettes/V02.1_param_optim.Rmd @@ -14,7 +14,7 @@ vignette: > library(airGR) library(DEoptim) library(hydroPSO) # Needs R version >= 3.6 or latticeExtra <= 0.6-28 on R 3.5 -library(Rmalschains) +# library(Rmalschains) # removed from CRAN since 2023-04-03 library(caRamel) library(ggplot2) library(GGally) @@ -172,6 +172,12 @@ optPSO <- hydroPSO::hydroPSO(fn = OptimGR4J, ## MA-LS-Chains +```{r, warning=FALSE, results='hide', message=FALSE, eval=FALSE} +# to install the package temporary removde from CRAN +# Rtools needed (windows : https://cran.r-project.org/bin/windows/Rtools/) +install.packages("https://cran.r-project.org/src/contrib/Archive/Rmalschains/Rmalschains_0.2-8.tar.gz", + repos = NULL, type = "source", dependencies = TRUE) +``` ```{r, warning=FALSE, results='hide', eval=FALSE} optMALS <- Rmalschains::malschains(fn = OptimGR4J, lower = lowerGR4J, upper = upperGR4J, -- GitLab