1.1.10

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: enmSdmX
 Type: Package
 Title: Species Distribution Modeling and Ecological Niche Modeling
-Version: 1.1.9
-Date: 2024-11-01
+Version: 1.1.10
+Date: 2024-11-06
 Authors@R: 
 	c(
 		person(

NEWS.md

@@ -1,3 +1,6 @@
+# enmSdmX 1.1.10 2024-11-06
+- `trainNS()` works when the number of predictors is >2 and interactions are allowed between variables (thank you again, Pascal!).  
+
 # enmSdmX 1.1.9 2024-11-01
 - `trainGAM()` does not include interaction terms if `interaction` is `NULL`, and does not fail when interactions are included and the number of predictors is >2 (thank you, Pascal!).  
 

R/trainNs.r

@@ -130,18 +130,16 @@ trainNS <- function(
 		# interaction terms
 		if (interaction & length(preds) > 1L & n >= 2 * presPerTermFinal) {
 
-			for (countPred1 in 1L:(length(preds) - 1L)) { # for each predictor test two-variable terms
+			predCombos <- utils::combn(preds, m = 2, simplify = FALSE)
 
-				pred1 <- preds[countPred1]
+			for (i in seq_along(predCombos)) {
 
-				for (countPred2 in 2L:length(preds)) { # for each second predictor test two-variable terms
+				pred1 <- predCombos[[i]][1]
+				pred2 <- predCombos[[i]][2]
 
-					pred2 <- preds[countPred2]
-					terms <- c(terms, paste0('splines::ns(', preds[countPred1], ' * ', preds[countPred2], ', df=', df, ')'))
+				terms <- c(terms, paste0('splines::ns(', pred1, ' * ', pred2, ', df=', df, ')'))
 
-				} # next second term
-
-			} # next first term
+			}
 
 		} # if more than one term