From 730ac9445aeb4e7b30758fcdab1f57eb2ff80eb4 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Thu, 19 Oct 2023 11:46:41 +0200
Subject: [PATCH] build(DESCRIPTION): remove 'hydroPSO' from the 'Suggests'
list - add add installation information in 'V02.1_param_optim' vignette
---
DESCRIPTION | 2 +-
vignettes/V02.1_param_optim.Rmd | 10 +++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 9a698c67..ac44399d 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, Rmalschains,
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 ad0c5127..407990cc 100644
--- a/vignettes/V02.1_param_optim.Rmd
+++ b/vignettes/V02.1_param_optim.Rmd
@@ -13,7 +13,7 @@ vignette: >
```{r, warning=FALSE, include=FALSE, fig.keep='none', results='hide'}
library(airGR)
library(DEoptim)
-library(hydroPSO) # Needs R version >= 3.6 or latticeExtra <= 0.6-28 on R 3.5
+# library(hydroPSO) # Needs R version >= 3.6 or latticeExtra <= 0.6-28 on R 3.5. Archived on 2023-10-16 as requires archived packages 'hydroTSM' and 'hydroGOF'.
library(Rmalschains)
library(caRamel)
library(ggplot2)
@@ -163,6 +163,14 @@ optDE <- DEoptim::DEoptim(fn = OptimGR4J,
## Particle Swarm
+```{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/hydroPSO/hydroPSO_0.5-1.tar.gz",
+ repos = NULL, type = "source", dependencies = TRUE)
+```
+
+
```{r, warning=FALSE, results='hide', message=FALSE, eval=FALSE}
optPSO <- hydroPSO::hydroPSO(fn = OptimGR4J,
lower = lowerGR4J, upper = upperGR4J,
--
GitLab