Fix check for variable names for new.env in BIOMOD_Projection and BIO…

…MOD_EnsembleForecasting (add exact parameter in .fun_testIfIn function)
biomodhub · May 22, 2024 · e177d8a · e177d8a
1 parent bdd84b0
commit e177d8a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/R/BIOMOD_EnsembleForecasting.R b/R/BIOMOD_EnsembleForecasting.R
@@ -593,11 +593,11 @@ BIOMOD_EnsembleForecasting <- function(bm.em,
     }
 
     if (inherits(new.env, 'SpatRaster')) {
-      .fun_testIfIn(TRUE, "names(new.env)", names(new.env), bm.em@expl.var.names)
+      .fun_testIfIn(TRUE, "names(new.env)", names(new.env), bm.em@expl.var.names, exact = TRUE)
       new.env.mask <- .get_data_mask(new.env, value.out = 1)
       new.env <- mask(new.env, new.env.mask)
     } else {
-      .fun_testIfIn(TRUE, "colnames(new.env)", colnames(new.env), bm.em@expl.var.names)
+      .fun_testIfIn(TRUE, "colnames(new.env)", colnames(new.env), bm.em@expl.var.names, exact = TRUE)
     }
 
     which.factor <- which(sapply(new.env, is.factor))

diff --git a/R/BIOMOD_Projection.R b/R/BIOMOD_Projection.R
@@ -529,11 +529,11 @@ BIOMOD_Projection <- function(bm.mod,
   }
 
   if (inherits(new.env, 'SpatRaster')) {
-    .fun_testIfIn(TRUE, "names(new.env)", names(new.env), bm.mod@expl.var.names)
+    .fun_testIfIn(TRUE, "names(new.env)", names(new.env), bm.mod@expl.var.names, exact = TRUE)
     new.env.mask <- .get_data_mask(new.env, value.out = 1)
     new.env <- mask(new.env, new.env.mask)
   } else {
-    .fun_testIfIn(TRUE, "colnames(new.env)", colnames(new.env), bm.mod@expl.var.names)
+    .fun_testIfIn(TRUE, "colnames(new.env)", colnames(new.env), bm.mod@expl.var.names, exact = TRUE)
     new.env <- new.env[ , bm.mod@expl.var.names, drop = FALSE]
   }
 

diff --git a/R/biomod2_internal.R b/R/biomod2_internal.R
@@ -51,9 +51,10 @@
   return(test)
 }
 
-.fun_testIfIn <- function(test, objName, objValue, values)
+.fun_testIfIn <- function(test, objName, objValue, values, exact = FALSE)
 {
-  if (any(! objValue %in% values)) {
+  if (any(! objValue %in% values) ||
+      (exact == TRUE && any(! values %in% objValue))) {
     stop(paste0("\n", objName, " must be '", 
                 ifelse(length(values) > 1, 
                        paste0(paste0(values[1:(length(values) -1)], collapse = "', '"),