check target classPos

aruaud · Jan 20, 2025 · 6c77e7e · 6c77e7e
1 parent 7c3cc0f
commit 6c77e7e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/R/model2DE.R b/R/model2DE.R
@@ -57,7 +57,7 @@ model2DE <- function(model, model_type, data, target,
 
 
   # define classPos if it has not been passed
-  if (is.character(target) && is.null(classPos) == TRUE) {
+  if (!is.numeric(target) && is.null(classPos) == TRUE) {
     classPos <- names(which.max(table(target)))
     cat("Positive class:", classPos, "\n")
   }

diff --git a/R/model2DE_resampling.R b/R/model2DE_resampling.R
@@ -57,7 +57,7 @@ model2DE_resampling <- function(model, model_type, data, target, classPos = NULL
 
   ### Get a network for each subset
   # define classPos if it has not been passed
-  if (is.character(target) && is.null(classPos) == TRUE) {
+  if (!is.numeric(target) && is.null(classPos) == TRUE) {
     classPos <- names(which.max(table(target)))
     cat("Positive class:", classPos, "\n")
   }

diff --git a/R/preCluster.R b/R/preCluster.R
@@ -34,6 +34,9 @@ preCluster <- function(model, model_type, data, target,
 
   #### Create the data partition
   if (length(sample_weight) == 2) {
+    if (is.null(classPos)) {
+      stop("classPos must be provided when using sample_weight = c(classPos weight, other classes weight).")
+    }
     sample_weight <- ifelse(target == classPos, sample_weight[1], sample_weight[2])
   } else if (is.null(sample_weight)) {
     sample_weight <- rep(1, length(target))