fixes while testing

[mothur.git] / aligncommand.h

diff --git a/aligncommand.h b/aligncommand.h
index 186ca63b15cbd09f881d29041de379dc5cf6b6b9..1410626a42e3a407289f18565dd0e64a3d4d3cd4 100644 (file)
--- a/aligncommand.h
+++ b/aligncommand.h
@@ -20,19 +20,25 @@ class AlignCommand : public Command {
        
 public:
        AlignCommand(string);   
+       AlignCommand();
        ~AlignCommand();
+       vector<string> getRequiredParameters();
+       vector<string> getValidParameters();
+       vector<string> getRequiredFiles();
+       map<string, vector<string> > getOutputFiles() { return outputTypes; }
        int execute(); 
        void help();    
        
 private:
        struct linePair {
                unsigned long int start;
-               int numSeqs;
-               linePair(unsigned long int i, int j) : start(i), numSeqs(j) {}
+               unsigned long int end;
+               linePair(unsigned long int i, unsigned long int j) : start(i), end(j) {}
        };
        vector<int> processIDS;   //processid
        vector<linePair*> lines;
        bool MPIWroteAccnos;
+       map<string, vector<string> > outputTypes;
        
        AlignmentDB* templateDB;
        Alignment* alignment;
@@ -43,13 +49,14 @@ private:
        void appendReportFiles(string, string);
        
        #ifdef USE_MPI
-       int driverMPI(int, int, MPI_File&, MPI_File&, MPI_File&, MPI_File&, vector<long>&);
+       int driverMPI(int, int, MPI_File&, MPI_File&, MPI_File&, MPI_File&, vector<unsigned long int>&);
        #endif
        
        string candidateFileName, templateFileName, distanceFileName, search, align, outputDir;
        float match, misMatch, gapOpen, gapExtend, threshold;
        int processors, kmerSize;
        vector<string> candidateFileNames;
+       vector<string> outputNames;
        
        bool abort, flip;
 };