Merge pull request #24 from ocbe-uio/fix-regression

Fix regression on `MADMMplasso()`
ocbe-uio · Jan 26, 2024 · e7a9592 · e7a9592
2 parents 930790e + c8dfd2f
commit e7a9592
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 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.9009
+Version: 0.0.0.9010
 Authors@R:
     c(
         person(

diff --git a/R/MADMMplasso.R b/R/MADMMplasso.R
@@ -210,7 +210,7 @@ MADMMplasso <- function(X, Z, y, alpha, my_lambda = NULL, lambda_min = 0.001, ma
       )
     }
     parallel::stopCluster(cl)
-  } else if (parallel && pal == 0) {
+  } else if (!parallel && pal == 0) {
     my_values <- lapply(
       seq_len(nlambda),
       function(g) {
@@ -253,7 +253,7 @@ MADMMplasso <- function(X, Z, y, alpha, my_lambda = NULL, lambda_min = 0.001, ma
       theta0 <- my_values[hh, ]$theta0 ### iteration
       beta_hat <- my_values[hh, ]$beta_hat
       y_hat <- my_values[hh, ]$y_hat
-    } else if (parallel && pal == 0) {
+    } else if (!parallel && pal == 0) {
       beta <- my_values[[hh]]$beta
       theta <- my_values[[hh]]$theta
       my_obj[[hh]] <- list(my_values[[hh]]$obj)