From e5c97da665bd4627c68bb65f5f098fcbbde50d4f Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Wed, 4 Apr 2018 07:49:24 +0200
Subject: [PATCH] v1.0.9.76 param_optim vignette updated (set.seed to have a
good convergence with malschains)
---
DESCRIPTION | 4 ++--
NEWS.rmd | 2 +-
vignettes/V02.1_param_optim.Rmd | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index f0ddec08..e0320a8e 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.0.9.75
-Date: 2018-02-01
+Version: 1.0.9.76
+Date: 2018-04-04
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl")),
person("Charles", "Perrin", role = c("aut", "ths")),
diff --git a/NEWS.rmd b/NEWS.rmd
index 4c5f9fa5..a75ba970 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -14,7 +14,7 @@ output:
-### 1.0.9.75 Release Notes (2018-02-01)
+### 1.0.9.765 Release Notes (2018-04-04)
____________________________________________________________________________________
diff --git a/vignettes/V02.1_param_optim.Rmd b/vignettes/V02.1_param_optim.Rmd
index d2db4046..3ccc7b49 100644
--- a/vignettes/V02.1_param_optim.Rmd
+++ b/vignettes/V02.1_param_optim.Rmd
@@ -16,7 +16,7 @@ library(DEoptim)
library(hydroPSO)
library(Rmalschains)
# source("airGR.R")
-set.seed(123)
+set.seed(321)
```
@@ -154,7 +154,7 @@ optMALS <- Rmalschains::malschains(fn = OptimGR4J,
As it can be seen in the table below, the four additional optimization strategies tested lead to very close optima.
```{r, warning=FALSE, echo=FALSE}
-data.frame(Algo = c("Michel", "PORT", "DE", "PSO", "MA-LS"),
+data.frame(Algo = c("airGR", "PORT", "DE", "PSO", "MA-LS"),
round(rbind(
OutputsCalib$ParamFinalR ,
airGR::TransfoParam_GR4J(ParamIn = optPORT$par , Direction = "TR"),
--
GitLab