Merge pull request #58 from ocbe-uio/issue-57

Moved validation of maxgrid
ocbe-uio · Sep 3, 2024 · eb848a7 · eb848a7
2 parents 7d59f3f + 65d1163
commit eb848a7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: MADMMplasso
 Title: Multi Variate Multi Response 'ADMM' with Interaction Effects
-Version: 0.0.0.9023
+Version: 0.0.0.9024
 Authors@R:
     c(
         person(

diff --git a/R/MADMMplasso.R b/R/MADMMplasso.R
@@ -49,9 +49,6 @@
 #' @example inst/examples/MADMMplasso_example.R
 #' @export
 MADMMplasso <- function(X, Z, y, alpha, my_lambda = NULL, lambda_min = 0.001, max_it = 50000, e.abs = 1E-3, e.rel = 1E-3, maxgrid, nlambda, rho = 5, my_print = FALSE, alph = 1.8, tree, pal = cl == 1L, gg = NULL, tol = 1E-4, cl = 1L, legacy = FALSE) {
-  # Validation
-  stopifnot(nlambda <= maxgrid)
-
   # Recalculating the number of CPUs
   if (pal && cl > 1L) {
     cl <- 1L
@@ -108,6 +105,9 @@ MADMMplasso <- function(X, Z, y, alpha, my_lambda = NULL, lambda_min = 0.001, ma
   rat <- lambda_min
 
   if (is.null(my_lambda)) {
+    # Validation
+    stopifnot(nlambda <= maxgrid)
+
     r <- y
 
     lammax <- lapply(