Merge pull request #3 from MatveevDaniil/main

autoswitching to hashmap version implemented in pattern function in c…
mlizhangx · Feb 15, 2024 · 7692777 · 7692777
2 parents 3725c9d + e8f62e8
commit 7692777
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/R/argchecks_mid.R b/R/argchecks_mid.R
@@ -227,7 +227,7 @@
     (is.matrix(x) || inherits(x, "sparseMatrix")) &&
     isTRUE(dim(x)[[1]] == dim(x)[[2]]) &&
     Matrix::isSymmetric(x, check.attributes = FALSE) &&
-    all(unique(as.vector(x)) %in% c(0, 1))
+    all(Matrix::Matrix(x, sparse = TRUE)@x %in% c(0, 1))
 }
 .MUST.isAdjacencyMatrix <- function(x, name = NULL) {
   if (is.null(name)) { name <- deparse(substitute(x)) }

diff --git a/R/network_analysis.R b/R/network_analysis.R
@@ -32,6 +32,9 @@ generateAdjacencyMatrix <- function(
   method <- .checkMethod(method, dist_cutoff)
   msg <- .makemsg(verbose)
   tmpfile <- tempfile(pattern = "col_ids", fileext = ".txt")
+  if (dist_cutoff == 0) {
+    method <- "pattern"
+  }
   if (dist_type == "levenshtein") {
     msg("Computing network edges based on a max ", dist_type, " distance of ",
         dist_cutoff, "...", newline = FALSE