Commit 0c3df1b8 authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

Cherry-pick 'master' v1.4.3.65

No related merge requests found
Showing with 18 additions and 7 deletions
+18 -7
......@@ -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/
......
......@@ -13,11 +13,22 @@
____________________________________________________________________________________
### 1.4.3.65 Release Notes (2020-02-28)
#### CRAN-compatibility updates
- The run period is reduced in the example of the <code>Imax()<code> function in order to run faster.
- The 'hydroPSO' package is no longer suggested (but the code linked to its use and is always present in the 'param_optim' vignette).
____________________________________________________________________________________
### 1.4.3.60 Release Notes (2020-01-29)
#### New features
- A digital object identifier (DOI) now allows to identify the manual of the airGR package. When you use airGR in your work, please always cite both the article and the manual. The last one allows to know the version of the package that is used in order to enhance reproducible research. The references can be displayed with the <code>citation("airGR")</code> command.
- A digital object identifier (DOI) now allows to identify the manual of the 'airGR' package. When you use airGR in your work, please always cite both the article and the manual. The last one allows to know the version of the package that is used in order to enhance reproducible research. The references can be displayed with the <code>citation("airGR")</code> command.
#### Bug fixes
......@@ -151,7 +162,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
......@@ -229,7 +240,7 @@ ________________________________________________________________________________
#### CRAN-compatibility updates
- The <code>vignetteParam&#42;.rda</code> datasets moved to the inst directory. It contains different objects needed for param_optim and param_mcmc vignettes.
- The <code>vignetteParam&#42;.rda</code> datasets moved to the inst directory. It contains different objects needed for 'param_optim' and 'param_mcmc' vignettes.
____________________________________________________________________________________
......@@ -313,7 +324,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>.
......@@ -626,7 +637,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) &times; NSE[Q].
......
......@@ -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)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment