diff --git a/DESCRIPTION b/DESCRIPTION index 9a698c6753d0e43c932580d58a790f35524d499f..ac44399dd2e86aa5085364f78d5181459c10a10a 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 ad0c5127a35efc0e708c8869789675ba7f94558e..407990ccecba18736152d8bf3b245e423d9e887a 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,