Fix max length in DBReader

Allocate CSProfile only when needed Co-authored-by: konstin < [email protected]>
soedinglab · Oct 5, 2021 · d873697 · d873697
1 parent 42bf643
commit d873697
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/alignment/PSSMCalculator.cpp b/src/alignment/PSSMCalculator.cpp
@@ -13,8 +13,11 @@
 
 PSSMCalculator::PSSMCalculator(SubstitutionMatrix *subMat, size_t maxSeqLength, size_t maxSetSize, int pcmode,
                                MultiParam<PseudoCounts> pca, MultiParam<PseudoCounts> pcb, int gapOpen, int gapPseudoCount)
-    : subMat(subMat), ps(maxSeqLength + 1), maxSeqLength(maxSeqLength), gapOpen(gapOpen), gapPseudoCount(gapPseudoCount), pca(pca), pcb(pcb) {
+    : subMat(subMat),  ps(NULL), maxSeqLength(maxSeqLength), gapOpen(gapOpen), gapPseudoCount(gapPseudoCount), pca(pca), pcb(pcb) {
 
+    if(gapPseudoCount == Parameters::PCMODE_CONTEXT_SPECIFIC){
+        ps = new CSProfile(maxSeqLength + 1);
+    }
     this->maxSeqLength = maxSeqLength;
     this->maxSetSize = maxSetSize;
     this->profile            = new float[(maxSeqLength + 1) * Sequence::PROFILE_AA_SIZE];
@@ -51,6 +54,9 @@ PSSMCalculator::PSSMCalculator(SubstitutionMatrix *subMat, size_t maxSeqLength,
 }
 
 PSSMCalculator::~PSSMCalculator() {
+    if(ps != NULL){
+        delete ps;
+    }
     delete[] profile;
     delete[] Neff_M;
     free(seqWeight);
@@ -150,7 +156,7 @@ PSSMCalculator::Profile PSSMCalculator::computePSSMFromMSA(size_t setSize, size_
         computePseudoCounts(profile, matchWeight, pseudocountsWeight, Sequence::PROFILE_AA_SIZE, Neff_M, queryLength, pca.values.normal(), pcb.values.normal());
     }else if (pcmode == Parameters::PCMODE_CONTEXT_SPECIFIC && pca.values.cs() > 0.0){
         fillCounteProfile(counts, matchWeight, Neff_M, queryLength);
-        float * csprofile = ps.computeProfileCs(static_cast<int>(queryLength), counts, Neff_M, pca.values.cs(), pcb.values.cs());
+        float * csprofile = ps->computeProfileCs(static_cast<int>(queryLength), counts, Neff_M, pca.values.cs(), pcb.values.cs());
         for (size_t pos = 0; pos < queryLength; pos++) {
             for (size_t aa = 0; aa < Sequence::PROFILE_AA_SIZE; ++aa) {
                 this->profile[pos * Sequence::PROFILE_AA_SIZE + aa] = csprofile[(pos * (Sequence::PROFILE_AA_SIZE + 4)) + aa];

diff --git a/src/alignment/PSSMCalculator.h b/src/alignment/PSSMCalculator.h
@@ -65,7 +65,7 @@ class PSSMCalculator {
     BaseMatrix* subMat;
 
     // cs profiles
-    CSProfile ps;
+    CSProfile * ps;
 
     // contains sequence weights (global)
     float * seqWeight;

diff --git a/src/commons/DBReader.cpp b/src/commons/DBReader.cpp
@@ -825,7 +825,9 @@ bool DBReader<T>::readIndex(char *data, size_t indexDataSize, Index *index, size
         }
     }
     dataSize = localDataSize;
-    maxSeqLen = localMaxSeqLen;
+    maxSeqLen = (Parameters::isEqualDbtype(dbtype, Parameters::DBTYPE_HMM_PROFILE ) ) ?
+            (std::max(localMaxSeqLen, 1u) - 1u) / Sequence::PROFILE_READIN_SIZE :
+             (std::max(localMaxSeqLen, 2u) - 2u);
     lastKey = localLastKey;
     return isSortedById;
 }