Упс, ошибка
authorMax <Infinity2573@gmail.com>
Mon, 19 Sep 2022 16:08:15 +0000 (19:08 +0300)
committerMax <Infinity2573@gmail.com>
Mon, 19 Sep 2022 16:08:15 +0000 (19:08 +0300)
src/dssptools.cpp

index e732ad40196857731c1dec63da0931a06fcf8927..948b3d13517dfb7d0edf6aa2e00a44d4fc4cfe36 100644 (file)
@@ -282,13 +282,13 @@ void secondaryStructures::analyzeTurnsAndHelicesPatterns(){
                 switch(i){
                 case turnsTypes::Turn_3:
                     for (std::size_t k {0}; empty && k < (static_cast<std::size_t>(i)); ++k){
-                        empty = SecondaryStructuresStatusMap[j + k].getStatus() == secondaryStructureTypes::Loop || SecondaryStructuresStatusMap[j + k].getStatus() == secondaryStructureTypes::Helix_3;
+                        empty = SecondaryStructuresStatusMap[j + k].getStatus(secondaryStructureTypes::Loop ) || SecondaryStructuresStatusMap[j + k].getStatus(secondaryStructureTypes::Helix_3);
                     }
                     Helix = secondaryStructureTypes::Helix_3;
                     break;
                 case turnsTypes::Turn_5:
                     for (std::size_t k {0}; empty && k < (static_cast<std::size_t>(i)); ++k){
-                        empty = SecondaryStructuresStatusMap[j + k].getStatus() == secondaryStructureTypes::Loop || SecondaryStructuresStatusMap[j + k].getStatus() == secondaryStructureTypes::Helix_5 || (PiHelixPreference && SecondaryStructuresStatusMap[j + k].getStatus() == secondaryStructureTypes::Helix_5);
+                        empty = SecondaryStructuresStatusMap[j + k].getStatus(secondaryStructureTypes::Loop ) || SecondaryStructuresStatusMap[j + k].getStatus(secondaryStructureTypes::Helix_5) || (PiHelixPreference && SecondaryStructuresStatusMap[j + k].getStatus(secondaryStructureTypes::Helix_5));
                     }
                     Helix = secondaryStructureTypes::Helix_4;
                     break;
@@ -307,7 +307,7 @@ void secondaryStructures::analyzeTurnsAndHelicesPatterns(){
     }
 
     for(std::size_t i {1}; i + 1 < SecondaryStructuresStatusMap.size(); ++i){
-        if (SecondaryStructuresStatusMap[i].getStatus() == secondaryStructureTypes::Loop ){
+        if (SecondaryStructuresStatusMap[i].getStatus(secondaryStructureTypes::Loop)){
             bool isTurn = false;
             for(const turnsTypes &j : {turnsTypes::Turn_3, turnsTypes::Turn_4, turnsTypes::Turn_5}){
                 for(std::size_t k {1}; k < (static_cast<std::size_t>(j)); ++k){