streamlined check_ functions for negative x--no error, drop models instead now

Author: Diego Barneche

R/check_data.R

@@ -28,9 +28,6 @@ check_data <- function(data, family, model) {
                 ". The function bnec requires the predictor",
                 " column to be numeric."))
   }
-  if (contains_negative(x) && model == "necsigm") {
-    stop("necsigm should only be called when predictor values are >= 0")
-  }
   test_x <- mean(x)
   test_y <- mean(y)
   if (!is.finite(test_x)) {

R/check_models.R

@@ -85,12 +85,13 @@ check_models <- function(model, family, data) {
   if (!missing(data)) {
     x <- retrieve_var(data, "x_var")
     if (contains_negative(x)) {
-      use_models <- setdiff(model, c("ecxsigm", "nechorme4pwr", "nechormepwr"))
+      not_allowed <- c("ecxsigm", "nechorme4pwr", "nechormepwr", "necsigm")
+      use_models <- setdiff(model, not_allowed)
       drop_models <- setdiff(model, use_models)
       model <- use_models
       if (length(drop_models) > 0) {
         message(
-          paste("Dropping the model(s)", drop_models,
+          paste("Dropping the model(s)", paste0(drop_models, collapse = ", "),
                 "as they are not valid for data with negative predictor (x)",
                 "values.")
         )