changes while testing

[mothur.git] / sparsedistancematrix.cpp

diff --git a/sparsedistancematrix.cpp b/sparsedistancematrix.cpp
index b315c487da1e39053307870560ca165d1068c49a..03e9fa8e5b77905d4a4416a6c592d3b3756a02e4 100644 (file)
--- a/sparsedistancematrix.cpp
+++ b/sparsedistancematrix.cpp
@@ -39,8 +39,10 @@ int SparseDistanceMatrix::updateCellCompliment(ull row, ull col){
         ull vcol = 0;
         
         //find the columns entry for this cell as well
-        for (int i = 0; i < seqVec[vrow].size(); i++) {  if (seqVec[vrow][i].index == row) { vcol = i;  break; }  }
-
+        for (int i = 0; i < seqVec[vrow].size(); i++) {  
+            if (seqVec[vrow][i].index == row) { vcol = i;  break; }  
+        }
+       
         seqVec[vrow][vcol].dist = seqVec[row][col].dist;
         
         return 0;
@@ -98,7 +100,9 @@ ull SparseDistanceMatrix::getSmallestCell(ull& row){
        
         for (int i = 0; i < seqVec.size(); i++) {
             for (int j = 0; j < seqVec[i].size(); j++) {
- 
+                
+                if (m->control_pressed) { return smallDist; }
+                
                 //already checked everyone else in row
                 if (i < seqVec[i][j].index) {