From bb7b6e4cf8f0c0b9dbea871eb323d64106a20271 Mon Sep 17 00:00:00 2001 From: Waldir Leoncio Date: Fri, 26 Jan 2024 13:40:30 +0100 Subject: [PATCH 1/2] Fixed regression on `if` statement (#17) Regression introduced by me on 072b64a4520a316f57e062a1192babe85a3acb3d. --- R/MADMMplasso.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R/MADMMplasso.R b/R/MADMMplasso.R index 9167ba5..11a9502 100644 --- 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) From c8dfd2f65851f453d0fc27194ccc78dfe099cd58 Mon Sep 17 00:00:00 2001 From: Waldir Leoncio Date: Fri, 26 Jan 2024 13:42:56 +0100 Subject: [PATCH 2/2] Increment version number to 0.0.0.9010 --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index ae09a7b..1f7a07d 100644 --- 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(