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

[mothur.git] / screenseqscommand.h

diff --git a/screenseqscommand.h b/screenseqscommand.h
index 602326c42e2ff75afbeb8050479cf7e188b8b634..49d992ac193c7aa42ad4492c9190bda40671fc0b 100644 (file)
--- a/screenseqscommand.h
+++ b/screenseqscommand.h
@@ -23,7 +23,9 @@ public:
        string getCommandName()                 { return "screen.seqs";                         }
        string getCommandCategory()             { return "Sequence Processing";         }
        string getHelpString(); 
-       
+       string getCitation() { return "http://www.mothur.org/wiki/Screen.seqs"; }
+       string getDescription()         { return "enables you to keep sequences that fulfill certain user defined criteria"; }
+
        int execute(); 
        void help() { m->mothurOut(getHelpString()); }  
        
@@ -31,9 +33,9 @@ public:
 private:
 
        struct linePair {
-               unsigned long int start;
-               unsigned long int end;
-               linePair(unsigned long int i, unsigned long int j) : start(i), end(j) {}
+               unsigned long long start;
+               unsigned long long end;
+               linePair(unsigned long long i, unsigned long long j) : start(i), end(j) {}
        };
 
        vector<int> processIDS;   //processid
@@ -43,23 +45,24 @@ private:
        int screenGroupFile(set<string>);
        int screenAlignReport(set<string>);
        int screenQual(set<string>);
+       int screenTaxonomy(set<string>);
        
        int driver(linePair*, string, string, string, set<string>&);
        int createProcesses(string, string, string, set<string>&);
        
        #ifdef USE_MPI
-       int driverMPI(int, int, MPI_File&, MPI_File&, MPI_File&, vector<unsigned long int>&, set<string>&);
+       int driverMPI(int, int, MPI_File&, MPI_File&, MPI_File&, vector<unsigned long long>&, set<string>&);
        #endif
 
        bool abort;
-       string fastafile, namefile, groupfile, alignreport, outputDir, qualfile;
+       string fastafile, namefile, groupfile, alignreport, outputDir, qualfile, taxonomy;
        int startPos, endPos, maxAmbig, maxHomoP, minLength, maxLength, processors, criteria;
        vector<string> outputNames;
        vector<string> optimize;
        map<string, int> nameMap;
        int readNames();
        
-       int getSummary(vector<unsigned long int>&);
+       int getSummary(vector<unsigned long long>&);
        int createProcessesCreateSummary(vector<int>&, vector<int>&, vector<int>&, vector<int>&, vector<int>&, string);
        int driverCreateSummary(vector<int>&, vector<int>&, vector<int>&, vector<int>&, vector<int>&, string, linePair*);       
 };