X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=nast.cpp;h=c91c9fab537172b3e02808b700af881affffc368;hb=9ada98592a54c82d08f3d46c9b1d8c3e472a922d;hp=4848eb20be0b5cfdb43715b5ba1589d253ba4571;hpb=63e089e0b3aad1741bab60119ed7ccc784dce347;p=mothur.git diff --git a/nast.cpp b/nast.cpp index 4848eb2..c91c9fa 100644 --- a/nast.cpp +++ b/nast.cpp @@ -26,13 +26,11 @@ Nast::Nast(Alignment* method, Sequence* cand, Sequence* temp) : alignment(method 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"); exit(1); } - } /**************************************************************************************************/ @@ -42,10 +40,10 @@ void Nast::pairwiseAlignSeqs(){ // Here we call one of the pairwise alignment me try { alignment->align(candidateSeq->getUnaligned(), templateSeq->getUnaligned()); - + string candAln = alignment->getSeqAAln(); string tempAln = alignment->getSeqBAln(); - + if(candAln == ""){ candidateSeq->setPairwise(""); @@ -78,7 +76,6 @@ 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) { errorOut(e, "Nast", "pairwiseAlignSeqs");