improvements in esm

sjevelazco · Apr 10, 2024 · e22c182 · e22c182
1 parent ee82c89
commit e22c182
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git a/R/esm_gam.R b/R/esm_gam.R
@@ -216,7 +216,7 @@ esm_gam <- function(data,
     dplyr::distinct(AUC_mean) %>%
     dplyr::pull()
   D <- 2 * (mtrc - 0.5) # Somers'D
-  filt <- mtrc > 0
+  filt <- D > 0
 
   if (sum(filt) == 0) {
     message("None bivariate model had Somer's D > 0.5. Try with another esm_* function. NA will be returned")

diff --git a/R/esm_gau.R b/R/esm_gau.R
@@ -144,7 +144,7 @@ esm_gau <- function(data,
     dplyr::distinct(AUC_mean) %>%
     dplyr::pull()
   D <- 2 * (mtrc - 0.5) # Somers'D
-  filt <- mtrc > 0
+  filt <- D > 0
 
   if (sum(filt) == 0) {
     message("None bivariate model had Somer's D > 0.5. Try with another esm_* function. NA will be returned")

diff --git a/R/esm_gbm.R b/R/esm_gbm.R
@@ -167,7 +167,7 @@ esm_gbm <- function(data,
     dplyr::distinct(AUC_mean) %>%
     dplyr::pull()
   D <- 2 * (mtrc - 0.5) # Somers'D
-  filt <- mtrc > 0
+  filt <- D > 0
 
   if (sum(filt) == 0) {
     message("None bivariate model had Somer's D > 0.5. Try with another esm_* function. NA will be returned")

diff --git a/R/esm_glm.R b/R/esm_glm.R
@@ -153,7 +153,7 @@ esm_glm <- function(data,
     dplyr::distinct(AUC_mean) %>%
     dplyr::pull()
   D <- 2 * (mtrc - 0.5) # Somers'D
-  filt <- mtrc > 0
+  filt <- D > 0
 
   if (sum(filt) == 0) {
     message("None bivariate model had Somer's D > 0.5. Try with another esm_* function. NA will be returned")

diff --git a/R/esm_max.R b/R/esm_max.R
@@ -194,7 +194,7 @@ esm_max <- function(data,
     dplyr::distinct(AUC_mean) %>%
     dplyr::pull()
   D <- 2 * (mtrc - 0.5) # Somers'D
-  filt <- mtrc > 0
+  filt <- D > 0
 
   if (sum(filt) == 0) {
     message("None bivariate model had Somer's D > 0.5. Try with another esm_* function. NA will be returned")

diff --git a/R/esm_net.R b/R/esm_net.R
@@ -145,7 +145,7 @@ esm_net <- function(data,
     dplyr::distinct(AUC_mean) %>%
     dplyr::pull()
   D <- 2 * (mtrc - 0.5) # Somers'D
-  filt <- mtrc > 0
+  filt <- D > 0
 
   if (sum(filt) == 0) {
     message("None bivariate model had Somer's D > 0.5. Try with another esm_* function. NA will be returned")

diff --git a/R/esm_svm.R b/R/esm_svm.R
@@ -154,7 +154,7 @@ esm_svm <- function(data,
     dplyr::distinct(AUC_mean) %>%
     dplyr::pull()
   D <- 2 * (mtrc - 0.5) # Somers'D
-  filt <- mtrc > 0
+  filt <- D > 0
 
   if (sum(filt) == 0) {
     message("None bivariate model had Somer's D > 0.5. Try with another esm_* function. NA will be returned")

diff --git a/R/sdm_predict.R b/R/sdm_predict.R
@@ -748,7 +748,8 @@ sdm_predict <-
         as.numeric() # get performance of esm
 
       ensemble_c <-
-        terra::app(model_c * weight_data, fun = mean, cores = 1)
+        terra::app(model_c * weight_data, fun = sum, cores = 1)
+      ensemble_c <- ensemble_c/sum(weight_data)
       names(ensemble_c) <- paste0("esm_", unique(names(model_c)))
 
       model_c <- list(ensemble_c)