Fix for sparse matrix failing

SchlossLab · Nov 7, 2024 · 862ed7c · 862ed7c
1 parent bd9082b
commit 862ed7c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/R/cluster.R b/R/cluster.R
@@ -207,7 +207,7 @@ read_count <- function(count_table_path) {
 #' @param j_index A list of j indexes, must be numeric
 #' @param distances A list of the distance at the i and j index
 #' @examples
-#' # This will return the path to our example file
+#' 
 #'  i_values <- as.integer(1:100)
 #'  j_values <- as.integer(sample(1:100, 100, TRUE))
 #'  x_values <- as.numeric(runif(100, 0, 1))

diff --git a/man/create_sparse_matrix.Rd b/man/create_sparse_matrix.Rd
diff --git a/src/MatrixAdapter.cpp b/src/MatrixAdapter.cpp
@@ -70,7 +70,10 @@ SparseDistanceMatrix MatrixAdapter::CreateSparseMatrix() {
     names.insert(samples.begin(), samples.end());
     const int nameSize = static_cast<int>(names.size());
     sparseMatrix.resize(nameSize);
-    if(static_cast<int>(xPosition.size()) > nameSize) { // There are values that should exist
+    // Not size, but the largest index inside of xPostions
+    const int maxXValue = *std::max_element(xPosition.begin(), xPosition.end());
+    const int maxYValue = *std::max_element(yPosition.begin(), yPosition.end());
+    if(std::max(maxXValue, maxYValue) > nameSize) { // There are values that should exist
         std::set<std::string> unknownNames;
         for(int i = nameSize; i < static_cast<int>(xPosition.size()); i++) {
             if(i >= nameSize + 2)