added sequence name to error string in fastq.info. Changed np_shannon to npshannon.

[mothur.git] / alignment.hpp

diff --git a/alignment.hpp b/alignment.hpp
index 336781244b5a3370c37a7ad6f369cd9553f31618..7a943fd0037430991a7baab418474e78a496d403 100644 (file)
--- a/alignment.hpp
+++ b/alignment.hpp
@@ -12,7 +12,6 @@
  *     As of 12/18/08 these included alignments based on blastn, needleman-wunsch, and the     Gotoh algorithms
  * 
  */
-using namespace std;
 
 #include "mothur.h"
 #include "alignmentcell.hpp"
@@ -24,17 +23,21 @@ class Alignment {
 public:
        Alignment(int);
        Alignment();
+       virtual ~Alignment();
        virtual void align(string, string) = 0;
        
-       float getAlignmentScore();
+       
+//     float getAlignmentScore();
        string getSeqAAln();
        string getSeqBAln();
        int getCandidateStartPos();
        int getCandidateEndPos();
        int getTemplateStartPos();
        int getTemplateEndPos();
-
+       
        int getPairwiseLength();
+       void resize(int);
+       int getnRows() { return nRows; }
 //     int getLongestTemplateGap();
 
 protected:
@@ -46,6 +49,7 @@ protected:
        int pairwiseLength;
        int nRows, nCols, lA, lB;
        vector<vector<AlignmentCell> > alignment;
+       MothurOut* m;
 };
 
 /**************************************************************************************************/