random chagnes from pat

[mothur.git] / nast.cpp

diff --git a/nast.cpp b/nast.cpp
index 90c8383f2a8a6fb23467d6b662879dfde5fd8f49..bf65fa2b46ea319bf54ab74a9696bb9e7b22fafe 100644 (file)
--- a/nast.cpp
+++ b/nast.cpp
@@ -25,8 +25,10 @@ Nast::Nast(Alignment* method, Sequence* cand, Sequence* temp) : alignment(method
        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) {
                m->errorOut(e, "Nast", "Nast");
@@ -43,7 +45,7 @@ void Nast::pairwiseAlignSeqs(){       //      Here we call one of the pairwise alignment me
 
                string candAln = alignment->getSeqAAln();
                string tempAln = alignment->getSeqBAln();
-
+       
                if(candAln == ""){
 
                        candidateSeq->setPairwise("");
@@ -76,6 +78,7 @@ void Nast::pairwiseAlignSeqs(){       //      Here we call one of the pairwise alignment me
 
                candidateSeq->setPairwise(candAln);                                     //      set the pairwise sequences in the Sequence objects for
                templateSeq->setPairwise(tempAln);                                      //      the candidate and template sequences
+
        }
        catch(exception& e) {
                m->errorOut(e, "Nast", "pairwiseAlignSeqs");
@@ -89,11 +92,6 @@ void Nast::removeExtraGaps(string& candAln, string tempAln, string newTemplateAl
 
 //     here we do steps C-F of Fig. 2 from DeSantis et al.
        try {
-       
-               //cout << candAln << endl;
-               //cout << tempAln << endl;
-               //cout << newTemplateAlign << endl;
-               //cout << endl;
                
                int longAlignmentLength = newTemplateAlign.length();    
        
@@ -187,7 +185,6 @@ void Nast::removeExtraGaps(string& candAln, string tempAln, string newTemplateAl
                                                }
                                        }
                                        i -= insertLength;
-       //if (i < 0) { cout << " we have a negative i = " << i << endl; }
 
                                }
                                else{
@@ -208,6 +205,9 @@ void Nast::removeExtraGaps(string& candAln, string tempAln, string newTemplateAl
                                }
                        
 //                             i -= insertLength;
+                               
+                               //if i is negative, we want to remove the extra gaps to the right
+                               if (i < 0) { cout << "i is negative" << endl; }
                        } 
                }
        }
@@ -221,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 = "";
                
@@ -250,6 +250,7 @@ void Nast::regapSequences(){        //This is essentially part B in Fig 2. of DeSantis
                string lastLoop = "";
                
                while(pairwiseAlignIndex<pairwiseLength){
+       //cout << pairwiseAlignIndex << '\t' << fullAlignIndex << '\t' << pairwiseLength << endl;
                        if(isalpha(tempPair[pairwiseAlignIndex]) && isalpha(tempAln[fullAlignIndex])
                           && isalpha(candPair[pairwiseAlignIndex])){
                                //  the template and candidate pairwise and template aligned have characters
@@ -356,6 +357,7 @@ 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) {
                m->errorOut(e, "Nast", "regapSequences");