X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=alignment.cpp;fp=alignment.cpp;h=25b27604533cbefa4ba1748001a45622e9712547;hb=3abb236c602eb168ee112f080b563ebe2c705029;hp=6014506f5e5f3065b13328b4205c972d4b78334a;hpb=0f297d3c211acbdfd4d941ef193a6702c5046dd1;p=mothur.git diff --git a/alignment.cpp b/alignment.cpp index 6014506..25b2760 100644 --- a/alignment.cpp +++ b/alignment.cpp @@ -20,72 +20,81 @@ Alignment::Alignment() { /* do nothing */ } /**************************************************************************************************/ Alignment::Alignment(int A) : nCols(A), nRows(A) { - - alignment.resize(nRows); // For the Gotoh and Needleman-Wunsch we initialize the dynamic programming - for(int i=0;i=0;i--){ + if(seqAaln[i] != '-' && seqBaln[i] == '-') { seqAend++; } + else if(seqAaln[i] == '-' && seqBaln[i] != '-') { seqBend++; } + else { break; } + } + pairwiseLength -= (seqAend + seqBend); + + seqAend = seqA.length() - seqAend - 1; + seqBend = seqB.length() - seqBend - 1; } - - pairwiseLength = seqAaln.length(); - seqAstart = 1; seqAend = 0; - seqBstart = 1; seqBend = 0; - - for(int i=0;i=0;i--){ - if(seqAaln[i] != '-' && seqBaln[i] == '-') { seqAend++; } - else if(seqAaln[i] == '-' && seqBaln[i] != '-') { seqBend++; } - else { break; } + catch(exception& e) { + errorOut(e, "Alignment", "traceBack"); + exit(1); } - pairwiseLength -= (seqAend + seqBend); - - seqAend = seqA.length() - seqAend - 1; - seqBend = seqB.length() - seqBend - 1; - } /**************************************************************************************************/