Added my_values as argument to loop functions (#17)

Because it is only recreated if `pal = 1`
ocbe-uio · Jan 26, 2024 · 4023f01 · 4023f01
1 parent b84e55a
commit 4023f01
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/R/MADMMplasso.R b/R/MADMMplasso.R
@@ -221,7 +221,7 @@ MADMMplasso <- function(X, Z, y, alpha, my_lambda = NULL, lambda_min = 0.001, ma
     lam, nlambda, beta0, theta0, beta, beta_hat, theta, rho1, X, Z, max_it,
     my_W_hat, XtY, y, N, e.abs, e.rel, alpha, alph, svd.w, tree, my_print,
     invmat, gg, tol, parallel, pal, BETA0, THETA0, BETA,
-    BETA_hat, Y_HAT, THETA, D, legacy
+    BETA_hat, Y_HAT, THETA, D, my_values, legacy
   )
 
   remove(invmat)

diff --git a/R/hh_nlambda_loop.R b/R/hh_nlambda_loop.R
@@ -2,7 +2,7 @@ hh_nlambda_loop <- function(
   lam, nlambda, beta0, theta0, beta, beta_hat, theta, rho1, X, Z, max_it,
   my_W_hat, XtY, y, N, e.abs, e.rel, alpha, alph, svd.w, tree, my_print,
   invmat, gg, tol, parallel, pal, BETA0, THETA0, BETA,
-  BETA_hat, Y_HAT, THETA, D, legacy = TRUE
+  BETA_hat, Y_HAT, THETA, D, my_values, legacy = TRUE
 ) {
   if (legacy) {
     obj <- NULL

diff --git a/src/hh_nlambda_loop_cpp.cpp b/src/hh_nlambda_loop_cpp.cpp
@@ -35,7 +35,8 @@ Rcpp::List hh_nlambda_loop_cpp(
   Rcpp::List BETA_hat,
   Rcpp::List Y_HAT,
   Rcpp::List THETA,
-  const unsigned int D
+  const unsigned int D,
+  Rcpp::List my_values
 ) {
   arma::vec obj;
   arma::vec non_zero_theta;