From 73a1183b5b4fe54b871cda7129e908a37e241347 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Tue, 10 Dec 2019 13:21:40 +0100
Subject: [PATCH] v1.4.2.6 UPDATE: tested_values argument renamed into
TestedValues into the Imax fun #13
---
DESCRIPTION | 2 +-
NEWS.md | 2 +-
R/Imax.R | 16 ++++++++--------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index f4fabeb5..fac74832 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.4.2.5
+Version: 1.4.2.6
Date: 2019-12-10
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
diff --git a/NEWS.md b/NEWS.md
index cf83a3d9..4ada447a 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,7 +2,7 @@
-### 1.4.2.5 Release Notes (2019-12-10)
+### 1.4.2.6 Release Notes (2019-12-10)
#### New features
diff --git a/R/Imax.R b/R/Imax.R
index 919ce850..254c6e5a 100644
--- a/R/Imax.R
+++ b/R/Imax.R
@@ -1,7 +1,7 @@
Imax <- function(InputsModel,
IndPeriod_Run,
- tested_values = seq(from = 0.1, to = 3, seq = 0.1)) {
+ TestedValues = seq(from = 0.1, to = 3, seq = 0.1)) {
##_____Arguments_check_____________________________________________________________________
if (!inherits(InputsModel, "InputsModel")) {
@@ -22,9 +22,9 @@ Imax <- function(InputsModel,
stop("'IndPeriod_Run' must be a continuous sequence of integers")
}
- ##tested_values
- if (!(is.numeric(tested_values))) {
- stop("'tested_values' must be 'numeric'")
+ ##TestedValues
+ if (!(is.numeric(TestedValues))) {
+ stop("'TestedValues' must be 'numeric'")
}
@@ -40,8 +40,8 @@ Imax <- function(InputsModel,
##calculate total interception of the GR5H interception store on the period
## and compute difference with daily values
- differences <- array(NA, c(length(tested_values)))
- for (Imax in tested_values) {
+ differences <- array(NA, c(length(TestedValues)))
+ for (Imax in TestedValues) {
C0 <- 0
cum_hourly <- 0
for (i in IndPeriod_Run) {
@@ -50,10 +50,10 @@ Imax <- function(InputsModel,
C0 <- C0 + InputsModel$Precip[i] - Ec - Pth
cum_hourly <- cum_hourly + Ec
}
- differences[which(Imax == tested_values)] <- abs(cum_hourly - cum_daily)
+ differences[which(Imax == TestedValues)] <- abs(cum_hourly - cum_daily)
}
##return the Imax value that minimises the difference
- return(tested_values[which.min(differences)])
+ return(TestedValues[which.min(differences)])
}
--
GitLab