Merge pull request #51 from AnqiWang2021/master

fix create_mixture_prior
stephenslab · Apr 22, 2024 · a61261d · a61261d
2 parents fc6d441 + ca286c6
commit a61261d
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 51 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -42,6 +42,6 @@ Remotes:
     stephenslab/susieR
 LazyData: true
 NeedsCompilation: no
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
 VignetteBuilder: knitr
 Roxygen: list(r6 = FALSE)
diff --git a/R/mash.R b/R/mash.R
@@ -65,7 +65,13 @@ create_mixture_prior <- function(mixture_prior, R, null_weight = NULL,
   }
   if (!missing(R)) {
     Ulist <- create_cov_canonical(R, ...)
+    Ulist <- lapply(Ulist, function(mat) {
+                           rownames(mat) <- include_indices
+                           colnames(mat) <- include_indices
+                           return(mat)
+                         })
     weights <- rep(1 / length(Ulist), length(Ulist))
+    weights <- setNames(weights, names(Ulist)) 
     if (max_mixture_len < length(Ulist) && max_mixture_len > 0) {
       stop(paste0(
         "Automatically generated uniform mixture prior is of ",

diff --git a/man/create_cov_canonical.Rd b/man/create_cov_canonical.Rd
diff --git a/man/mvsusie.Rd b/man/mvsusie.Rd