update

jokergoo · Oct 21, 2019 · 62bd646 · 62bd646
1 parent 0ed4893
commit 62bd646
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/R/Upset.R b/R/Upset.R
@@ -87,7 +87,7 @@ make_comb_mat_from_matrix = function(x, mode, top_n_sets = Inf, min_set_size = -
 	comb_mat = t(comb_mat)
 
 	nc = ncol(comb_mat)
-	comb_mat2 = Matrix::Matrix(0, nrow = nrow(comb_mat), ncol = nc*(nc-1)/2, sparse = TRUE)
+	comb_mat2 = matrix(0, nrow = nrow(comb_mat), ncol = nc*(nc-1)/2)
 	rownames(comb_mat2) = rownames(comb_mat)
 	if(mode == "intersect") {
 		if(nc > 1) {
@@ -223,7 +223,7 @@ make_comb_mat_from_list = function(lt, mode, value_fun = length, top_n_sets = In
     	complement_size = value_fun(complement_set)
     }
 
-    comb_mat = Matrix::Matrix(FALSE, nrow = n, ncol = sum(choose(n, 1:n)), s)
+    comb_mat = matrix(FALSE, nrow = n, ncol = sum(choose(n, 1:n)))
     rownames(comb_mat) = nm
     j = 1
     for(k in 1:n) {
@@ -579,7 +579,7 @@ comb_name = function(m, readable = FALSE) {
 		nm = sapply(strsplit(nm, ""), function(x) {
 			l = as.logical(as.numeric(x))
 			paste(sn[l], collapse = "&")
-		}
+		})
 		nm = unname(nm)
 	}
 

diff --git a/man/comb_name.Rd b/man/comb_name.Rd
@@ -7,11 +7,12 @@ Names of the Combination sets
 Names of the Combination sets
 }
 \usage{
-comb_name(m)
+comb_name(m, readable = FALSE)
 }
 \arguments{
 
   \item{m}{A combination matrix returned by \code{\link{make_comb_mat}}.}
+  \item{readable}{Whether the combination represents as e.g. "A&B&C".}
 
 }
 \details{
@@ -31,4 +32,5 @@ lt = list(a = sample(letters, 10),
           c = sample(letters, 20))
 m = make_comb_mat(lt)
 comb_name(m)
+comb_name(m, readable = TRUE)
 }