From 62c6f3eacc9d3fdda03244d2bef82d6879152e8f Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Tue, 29 Jan 2019 09:13:34 +0100
Subject: [PATCH] v1.1.2.33 CLEAN: example cor simplified in ErrorCrit_* doc
---
DESCRIPTION | 4 ++--
NEWS.rmd | 2 +-
man/ErrorCrit_KGE.Rd | 5 ++---
man/ErrorCrit_KGE2.Rd | 5 ++---
man/ErrorCrit_NSE.Rd | 5 ++---
man/ErrorCrit_RMSE.Rd | 5 ++---
6 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 2c78fa49..a18cad10 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.1.2.32
-Date: 2019-01-18
+Version: 1.1.2.3
+Date: 2019-01-29
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
person("Charles", "Perrin", role = c("aut", "ths"), comment = c(ORCID = "0000-0001-8552-1881")),
diff --git a/NEWS.rmd b/NEWS.rmd
index d87af4ab..c051d8f7 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -13,7 +13,7 @@ output:
-### 1.1.2.32 Release Notes (2019-01-18)
+### 1.1.2.33 Release Notes (2019-01-29)
diff --git a/man/ErrorCrit_KGE.Rd b/man/ErrorCrit_KGE.Rd
index f15047e3..3ba295f8 100644
--- a/man/ErrorCrit_KGE.Rd
+++ b/man/ErrorCrit_KGE.Rd
@@ -90,9 +90,8 @@ InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_KGE, InputsModel = InputsMod
transfo = transfo)
OutputsCrit <- ErrorCrit_KGE(InputsCrit = InputsCrit, OutputsModel = OutputsModel)
-## efficiency criterion: Kling-Gupta Efficiency above a threshold (q75\%)
-BoolCrit <- rep(TRUE, length(BasinObs$Qmm[Ind_Run]));
-BoolCrit[BasinObs$Qmm[Ind_Run]<quantile(BasinObs$Qmm[Ind_Run], 0.75, na.rm = TRUE)] <- FALSE
+## efficiency criterion: Kling-Gupta Efficiency above a threshold (quant. 75 \%)
+BoolCrit <- BasinObs$Qmm[Ind_Run] >= quantile(BasinObs$Qmm[Ind_Run], 0.75, na.rm = TRUE)
InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_KGE, InputsModel = InputsModel,
RunOptions = RunOptions, obs = BasinObs$Qmm[Ind_Run],
BoolCrit = BoolCrit)
diff --git a/man/ErrorCrit_KGE2.Rd b/man/ErrorCrit_KGE2.Rd
index 3e3f1d06..2bba9b4b 100644
--- a/man/ErrorCrit_KGE2.Rd
+++ b/man/ErrorCrit_KGE2.Rd
@@ -90,9 +90,8 @@ InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_KGE2, InputsModel = InputsMo
transfo = transfo)
OutputsCrit <- ErrorCrit_KGE2(InputsCrit = InputsCrit, OutputsModel = OutputsModel)
-## efficiency criterion: Kling-Gupta Efficiency above a threshold (q75\%)
-BoolCrit <- rep(TRUE, length(BasinObs$Qmm[Ind_Run]));
-BoolCrit[BasinObs$Qmm[Ind_Run]<quantile(BasinObs$Qmm[Ind_Run], 0.75, na.rm = TRUE)] <- FALSE
+## efficiency criterion: Kling-Gupta Efficiency above a threshold (quant. 75 \%)
+BoolCrit <- BasinObs$Qmm[Ind_Run] >= quantile(BasinObs$Qmm[Ind_Run], 0.75, na.rm = TRUE)
InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_KGE2, InputsModel = InputsModel,
RunOptions = RunOptions, obs = BasinObs$Qmm[Ind_Run],
BoolCrit = BoolCrit)
diff --git a/man/ErrorCrit_NSE.Rd b/man/ErrorCrit_NSE.Rd
index 5a5cdcee..1d33a091 100644
--- a/man/ErrorCrit_NSE.Rd
+++ b/man/ErrorCrit_NSE.Rd
@@ -83,9 +83,8 @@ InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_NSE, InputsModel = InputsMod
transfo = transfo)
OutputsCrit <- ErrorCrit_NSE(InputsCrit = InputsCrit, OutputsModel = OutputsModel)
-## efficiency criterion: Nash-Sutcliffe Efficiency above a threshold (q75\%)
-BoolCrit <- rep(TRUE, length(BasinObs$Qmm[Ind_Run]));
-BoolCrit[BasinObs$Qmm[Ind_Run]<quantile(BasinObs$Qmm[Ind_Run], 0.75, na.rm = TRUE)] <- FALSE
+## efficiency criterion: Kling-Gupta Efficiency above a threshold (quant. 75 \%)
+BoolCrit <- BasinObs$Qmm[Ind_Run] >= quantile(BasinObs$Qmm[Ind_Run], 0.75, na.rm = TRUE)
InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_NSE, InputsModel = InputsModel,
RunOptions = RunOptions, obs = BasinObs$Qmm[Ind_Run],
BoolCrit = BoolCrit)
diff --git a/man/ErrorCrit_RMSE.Rd b/man/ErrorCrit_RMSE.Rd
index d329edaa..bba55c1b 100644
--- a/man/ErrorCrit_RMSE.Rd
+++ b/man/ErrorCrit_RMSE.Rd
@@ -81,9 +81,8 @@ InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_RMSE, InputsModel = InputsMo
transfo = transfo)
OutputsCrit <- ErrorCrit_RMSE(InputsCrit = InputsCrit, OutputsModel = OutputsModel)
-## efficiency criterion: root-mean-square error above a threshold (q75\%)
-BoolCrit <- rep(TRUE, length(BasinObs$Qmm[Ind_Run]));
-BoolCrit[BasinObs$Qmm[Ind_Run]<quantile(BasinObs$Qmm[Ind_Run], 0.75, na.rm = TRUE)] <- FALSE
+## efficiency criterion: Kling-Gupta Efficiency above a threshold (quant. 75 \%)
+BoolCrit <- BasinObs$Qmm[Ind_Run] >= quantile(BasinObs$Qmm[Ind_Run], 0.75, na.rm = TRUE)
InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_RMSE, InputsModel = InputsModel,
RunOptions = RunOptions, obs = BasinObs$Qmm[Ind_Run],
BoolCrit = BoolCrit)
--
GitLab