scorecomplex many against many bug fixed real final

steineggerlab · Jan 4, 2024 · 49dabe0 · 49dabe0
1 parent 1c4fdfa
commit 49dabe0
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/strucclustutils/scorecomplex.cpp b/src/strucclustutils/scorecomplex.cpp
@@ -301,7 +301,7 @@ class DBSCANCluster {
 
     unsigned int clusterAlns() {
         initializeAlnLabels();
-        if (recursiveNum==0 && searchResult.alnVec.size() == idealClusterSize) {
+        if (recursiveNum==0 && searchResult.alnVec.size() <= idealClusterSize) {
             checkClusteringNecessity();
         }
         if (++recursiveNum > MAX_RECURSIVE_NUM) return UNCLUSTERED;
@@ -424,7 +424,7 @@ class DBSCANCluster {
 
     unsigned int finishDBSCAN() {
         initializeAlnLabels();
-        if (prevMaxClusterSize < minClusterSize) return UNCLUSTERED;
+        if (prevMaxClusterSize < minClusterSize || bestClusters.empty()) return UNCLUSTERED;
         cLabel = CLUSTERED;
         for (auto &cluster: bestClusters) {
             for (auto alnIdx: cluster) {
@@ -442,6 +442,7 @@ class DBSCANCluster {
         }
         if (checkChainRedundancy())
             return UNCLUSTERED;
+        prevMaxClusterSize = neighbors.size();
         bestClusters.emplace_back(neighbors);
         return finishDBSCAN();
     }