Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix regression on MADMMplasso() #24

Merged
merged 2 commits into from
Jan 26, 2024
Merged

Fix regression on MADMMplasso() #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb7b6e4
Fixed regression on `if` statement (#17)
wleoncio Jan 26, 2024
c8dfd2f
Increment version number to 0.0.0.9010
wleoncio Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
4 changes: 2 additions & 2 deletions R/MADMMplasso.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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)
Expand Down
Loading