X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=nast.cpp;h=647e0e4f1e17e205c183c78615a966b7a98545cc;hp=f247037cc915fd1d54d9d1e050abde8f73711fba;hb=cf9987b67aa49777a4c91c2d21f96e58bf17aa82;hpb=c4fb347858dd8cfea4d2933f429fff4130dca65b diff --git a/nast.cpp b/nast.cpp index f247037..647e0e4 100644 --- a/nast.cpp +++ b/nast.cpp @@ -23,29 +23,29 @@ Nast::Nast(Alignment* method, Sequence* cand, Sequence* temp) : alignment(method), candidateSeq(cand), templateSeq(temp) { try { + m = MothurOut::getInstance(); maxInsertLength = 0; + pairwiseAlignSeqs(); // This is part A in Fig. 2 of DeSantis et al. regapSequences(); // This is parts B-F in Fig. 2 of DeSantis et al. - + } catch(exception& e) { - errorOut(e, "Nast", "Nast"); + m->errorOut(e, "Nast", "Nast"); exit(1); } - } /**************************************************************************************************/ void Nast::pairwiseAlignSeqs(){ // Here we call one of the pairwise alignment methods to align our unaligned candidate // and template sequences - try { - + try { alignment->align(candidateSeq->getUnaligned(), templateSeq->getUnaligned()); - + string candAln = alignment->getSeqAAln(); string tempAln = alignment->getSeqBAln(); - + if(candAln == ""){ candidateSeq->setPairwise(""); @@ -81,7 +81,7 @@ void Nast::pairwiseAlignSeqs(){ // Here we call one of the pairwise alignment me } catch(exception& e) { - errorOut(e, "Nast", "pairwiseAlignSeqs"); + m->errorOut(e, "Nast", "pairwiseAlignSeqs"); exit(1); } } @@ -92,19 +92,19 @@ void Nast::removeExtraGaps(string& candAln, string tempAln, string newTemplateAl // here we do steps C-F of Fig. 2 from DeSantis et al. try { - + int longAlignmentLength = newTemplateAlign.length(); for(int i=0; i0;leftIndex--){ // then we've got problems... + for(leftIndex=i-1;leftIndex>0;leftIndex--){ // then we've got problems... if(!isalpha(candAln[leftIndex])){ leftRoom = 1; //count how far it is to the nearest gap on the LEFT side of the anomaly while(leftIndex-leftRoom>=0 && !isalpha(candAln[leftIndex-leftRoom])) { leftRoom++; } @@ -119,7 +119,7 @@ void Nast::removeExtraGaps(string& candAln, string tempAln, string newTemplateAl break; } } - + int insertLength = 0; // figure out how long the anomaly is while(!isalpha(newTemplateAlign[i + insertLength])) { insertLength++; } if(insertLength > maxInsertLength){ maxInsertLength = insertLength; } @@ -130,79 +130,89 @@ void Nast::removeExtraGaps(string& candAln, string tempAln, string newTemplateAl if((i-leftIndex) <= (rightIndex-i)){ // the left gap is closer - > move stuff left there's if(leftRoom >= insertLength){ // enough room to the left to move - + //cout << "lr newTemplateAlign = " << newTemplateAlign.length() << '\t' << i << '\t' << insertLength << endl; string leftTemplateString = newTemplateAlign.substr(0,i); - string rightTemplateString = newTemplateAlign.substr(i+insertLength); + string rightTemplateString = newTemplateAlign.substr((i+insertLength)); newTemplateAlign = leftTemplateString + rightTemplateString; longAlignmentLength = newTemplateAlign.length(); - - string leftCandidateString = candAln.substr(0,leftIndex-insertLength+1); - string rightCandidateString = candAln.substr(leftIndex+1); + //cout << "lr candAln = " << candAln.length() << '\t' << leftIndex << '\t' << endl; + string leftCandidateString = candAln.substr(0,(leftIndex-insertLength+1)); + string rightCandidateString = candAln.substr((leftIndex+1)); candAln = leftCandidateString + rightCandidateString; - - } - else{ // not enough room to the left, have to steal some space to - string leftTemplateString = newTemplateAlign.substr(0,i); // the right - string rightTemplateString = newTemplateAlign.substr(i+insertLength); + + }else{ // not enough room to the left, have to steal some space to the right + + //cout << "in else lr newTemplateAlign = " << newTemplateAlign.length() << '\t' << i << '\t' << insertLength << endl; + string leftTemplateString = newTemplateAlign.substr(0,i); + string rightTemplateString = newTemplateAlign.substr((i+insertLength)); newTemplateAlign = leftTemplateString + rightTemplateString; longAlignmentLength = newTemplateAlign.length(); - - string leftCandidateString = candAln.substr(0,leftIndex-leftRoom+1); - string insertString = candAln.substr(leftIndex+1,rightIndex-leftIndex-1); - string rightCandidateString = candAln.substr(rightIndex+(insertLength-leftRoom)); + //cout << " in else lr candAln = " << candAln.length() << '\t' << " leftIndex = " << leftIndex << " leftroom = " << leftRoom << " rightIndex = " << rightIndex << '\t' << " rightroom = " << rightRoom << '\t' << endl; + string leftCandidateString = candAln.substr(0,(leftIndex-leftRoom+1)); + string insertString = candAln.substr((leftIndex+1),(rightIndex-leftIndex-1)); + string rightCandidateString = candAln.substr((rightIndex+(insertLength-leftRoom))); candAln = leftCandidateString + insertString + rightCandidateString; } - } - else{ // the right gap is closer - > move stuff right there's + }else{ // the right gap is closer - > move stuff right there's if(rightRoom >= insertLength){ // enough room to the right to move - + //cout << "rr newTemplateAlign = " << newTemplateAlign.length() << '\t' << i << '\t' << i+insertLength << endl; string leftTemplateString = newTemplateAlign.substr(0,i); - string rightTemplateString = newTemplateAlign.substr(i+insertLength); + string rightTemplateString = newTemplateAlign.substr((i+insertLength)); newTemplateAlign = leftTemplateString + rightTemplateString; longAlignmentLength = newTemplateAlign.length(); - + //cout << "rr candAln = " << candAln.length() << '\t' << i << '\t' << rightIndex << '\t' << rightIndex+insertLength << endl; string leftCandidateString = candAln.substr(0,rightIndex); - string rightCandidateString = candAln.substr(rightIndex+insertLength); + string rightCandidateString = candAln.substr((rightIndex+insertLength)); candAln = leftCandidateString + rightCandidateString; } - else{ // not enough room to the right, have to steal some - + else{ // not enough room to the right, have to steal some // space to the left lets move left and then right... + //cout << "in else rr newTemplateAlign = " << newTemplateAlign.length() << '\t' << i << '\t' << i+insertLength << endl; string leftTemplateString = newTemplateAlign.substr(0,i); - string rightTemplateString = newTemplateAlign.substr(i+insertLength); + string rightTemplateString = newTemplateAlign.substr((i+insertLength)); newTemplateAlign = leftTemplateString + rightTemplateString; longAlignmentLength = newTemplateAlign.length(); - - string leftCandidateString = candAln.substr(0,leftIndex-(insertLength-rightRoom)+1); - string insertString = candAln.substr(leftIndex+1,rightIndex-leftIndex-1); - string rightCandidateString = candAln.substr(rightIndex+rightRoom); + //cout << "in else rr candAln = " << candAln.length() << '\t' << '\t' << (leftIndex-(insertLength-rightRoom)+1) << '\t' << (leftIndex+1,rightIndex-leftIndex-1) << '\t' << (rightIndex+rightRoom) << endl; + string leftCandidateString = candAln.substr(0,(leftIndex-(insertLength-rightRoom)+1)); + string insertString = candAln.substr((leftIndex+1),(rightIndex-leftIndex-1)); + string rightCandidateString = candAln.substr((rightIndex+rightRoom)); candAln = leftCandidateString + insertString + rightCandidateString; } } + + if ((i - insertLength) < 0) { i = 0; } + else { i -= insertLength; } + } else{ - // there could be a case where there isn't enough room in - string leftTemplateString = newTemplateAlign.substr(0,i); // either direction to move stuff - string rightTemplateString = newTemplateAlign.substr(i+leftRoom+rightRoom); + // there could be a case where there isn't enough room in either direction to move stuff +//cout << "in else else newTemplateAlign = " << newTemplateAlign.length() << '\t' << i << '\t' << (i+leftRoom+rightRoom) << endl; + string leftTemplateString = newTemplateAlign.substr(0,i); + string rightTemplateString = newTemplateAlign.substr((i+leftRoom+rightRoom)); newTemplateAlign = leftTemplateString + rightTemplateString; longAlignmentLength = newTemplateAlign.length(); - string leftCandidateString = candAln.substr(0,leftIndex-leftRoom+1); - string insertString = candAln.substr(leftIndex+1,rightIndex-leftIndex-1); - string rightCandidateString = candAln.substr(rightIndex+rightRoom); + //cout << "in else else newTemplateAlign = " << candAln.length() << '\t' << (leftIndex-leftRoom+1) << '\t' << (leftIndex+1) << '\t' << (rightIndex-leftIndex-1) << '\t' << (rightIndex+rightRoom) << endl; + string leftCandidateString = candAln.substr(0,(leftIndex-leftRoom+1)); + string insertString = candAln.substr((leftIndex+1),(rightIndex-leftIndex-1)); + string rightCandidateString = candAln.substr((rightIndex+rightRoom)); candAln = leftCandidateString + insertString + rightCandidateString; - + + i -= (leftRoom + rightRoom); } - i -= insertLength; +// i -= insertLength; + + //if i is negative, we want to remove the extra gaps to the right + if (i < 0) { m->mothurOut("i is negative"); m->mothurOutEndLine(); } } } } catch(exception& e) { - errorOut(e, "Nast", "removeExtraGaps"); + m->errorOut(e, "Nast", "removeExtraGaps"); exit(1); } } @@ -211,7 +221,7 @@ void Nast::removeExtraGaps(string& candAln, string tempAln, string newTemplateAl void Nast::regapSequences(){ //This is essentially part B in Fig 2. of DeSantis et al. try { - + //cout << candidateSeq->getName() << endl; string candPair = candidateSeq->getPairwise(); string candAln = ""; @@ -240,6 +250,7 @@ void Nast::regapSequences(){ //This is essentially part B in Fig 2. of DeSantis string lastLoop = ""; while(pairwiseAlignIndexmothurOut("We're into D " + toString(fullAlignIndex) + " " + toString(pairwiseAlignIndex)); m->mothurOutEndLine(); pairwiseAlignIndex++; } else{ // everything has a gap - not possible // not tested yet - mothurOut("We're into F " + toString(fullAlignIndex) + " " + toString(pairwiseAlignIndex)); mothurOutEndLine(); + m->mothurOut("We're into F " + toString(fullAlignIndex) + " " + toString(pairwiseAlignIndex)); m->mothurOutEndLine(); pairwiseAlignIndex++; fullAlignIndex++; } @@ -346,9 +357,10 @@ void Nast::regapSequences(){ //This is essentially part B in Fig 2. of DeSantis } // 2 of Desantis et al. candidateSeq->setAligned(candAln); + //cout << "here" << endl; } catch(exception& e) { - errorOut(e, "Nast", "regapSequences"); + m->errorOut(e, "Nast", "regapSequences"); exit(1); } } @@ -383,7 +395,7 @@ float Nast::getSimilarityScore(){ } catch(exception& e) { - errorOut(e, "Nast", "getSimilarityScore"); + m->errorOut(e, "Nast", "getSimilarityScore"); exit(1); } }