From 334c94a8be54de05100a2a56a7c0d779f60d43dd Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Tue, 29 Jan 2019 15:58:59 +0100
Subject: [PATCH] CHERRY-PICK: v1.1.2.36 CLEAN: change the message and the
place of the check on obs in CreateInputsCrit #ec035622
---
R/CreateInputsCrit.R | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/R/CreateInputsCrit.R b/R/CreateInputsCrit.R
index d45f4a1c..2c59f625 100644
--- a/R/CreateInputsCrit.R
+++ b/R/CreateInputsCrit.R
@@ -134,6 +134,12 @@ CreateInputsCrit <- function(FUN_CRIT,
return(NULL)
}
+ ## check 'obs'
+ if (!is.vector(iListArgs2$obs) | length(iListArgs2$obs) != LLL | !is.numeric(iListArgs2$obs)) {
+ stop(sprintf("'obs' must be a (list of) vector(s) of numeric values of length %i \n", LLL), call. = FALSE)
+ return(NULL)
+ }
+
## check 'BoolCrit'
if (is.null(iListArgs2$BoolCrit)) {
iListArgs2$BoolCrit <- rep(TRUE, length(iListArgs2$obs))
@@ -147,12 +153,6 @@ CreateInputsCrit <- function(FUN_CRIT,
return(NULL)
}
- ## check 'obs'
- if (!is.vector(iListArgs2$obs) | length(iListArgs2$obs) != LLL | !is.numeric(iListArgs2$obs)) {
- stop("'obs' must be a (list of) vector(s) of numeric values \n", call. = FALSE)
- return(NULL)
- }
-
## check 'varObs'
if (!is.vector(iListArgs2$varObs) | length(iListArgs2$varObs) != 1 | !is.character(iListArgs2$varObs) | !all(iListArgs2$varObs %in% inVarObs)) {
stop(msgVarObs, call. = FALSE)
--
GitLab