diff --git a/DESCRIPTION b/DESCRIPTION index c681d3e4e12e348464015cd5cdf0e6a83301e1c8..dbfc5fc3ddf104a09cb7fc91b67b2559d070c915 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: airGR Type: Package Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling -Version: 1.4.3.63 -Date: 2020-02-26 +Version: 1.4.3.64 +Date: 2020-02-28 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@inrae.fr"), @@ -20,7 +20,7 @@ Authors@R: c( person("Audrey", "Valéry", role = c("ctb")) ) Depends: R (>= 3.0.1) -Suggests: knitr, rmarkdown, coda, DEoptim, dplyr, FME, ggmcmc, hydroPSO, Rmalschains +Suggests: knitr, rmarkdown, coda, DEoptim, dplyr, FME, ggmcmc, Rmalschains 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), a snow accumulation and melt model (CemaNeige) and the associated functions for their calibration and evaluation. Use help(airGR) for package description and references. License: GPL-2 URL: https://hydrogr.github.io/airGR/ diff --git a/NEWS.md b/NEWS.md index afd354fe513142628fd307605658ac9a844ed1de..25b0ae2ec09f6c3b2ad5029da4b43655bb20c939 100644 --- a/NEWS.md +++ b/NEWS.md @@ -147,7 +147,7 @@ ________________________________________________________________________________ - Added the <code>X0310010</code> dataset to run the examples using the Linear Hysteresis with CemaNeige (it contains necessary SCA data). -- Added the cemaneige_hysteresis vignette to explain how to manage the use of the Linear Hysteresis with CemaNeige. +- Added the 'cemaneige_hysteresis' vignette to explain how to manage the use of the Linear Hysteresis with CemaNeige. #### Deprecated and defunct @@ -225,7 +225,7 @@ ________________________________________________________________________________ #### CRAN-compatibility updates -- The <code>vignetteParam*.rda</code> datasets moved to the inst directory. It contains different objects needed for param_optim and param_mcmc vignettes. +- The <code>vignetteParam*.rda</code> datasets moved to the inst directory. It contains different objects needed for 'param_optim' and 'param_mcmc' vignettes. ____________________________________________________________________________________ @@ -309,7 +309,7 @@ ________________________________________________________________________________ #### New features -- An article describing the airGR package has been published. Its reference has been added and will be displayed with <code>citation("airGR")</code>. +- An article describing the 'airGR' package has been published. Its reference has been added and will be displayed with <code>citation("airGR")</code>. - Added <code>CreateIniStates()</code> function in order to help user to format the <code>IniStates</code> argument for <code>CreateRunOptions()</code>. @@ -622,7 +622,7 @@ ________________________________________________________________________________ - Additional functions for results plotting (the <code>{zoo}</code> package is required for some of them). -- Add multi-objective calibration using <code>nsga2()</code> (the <code>{mco}</code> package is required). +- Add multi-objective calibration using <code>nsga2()</code> (the 'mco' package is required). - The field Multiplier has been added in the ErrorCrit() outputs, to indicate whether the criterion is an error (to minimise) or and efficiency (to maximise). This allows to provide real efficiency values in the outputs e.g. NSE[Q] instead of (-1) × NSE[Q]. diff --git a/vignettes/V02.1_param_optim.Rmd b/vignettes/V02.1_param_optim.Rmd index 1531c1c408682a741ba8bcb6b642a256ad60d703..f6b45bdefe3bdf8782f4e5f1433ec22f9b42d314 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) +#library(hydroPSO) library(Rmalschains) # source("airGR.R") set.seed(321)