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

[mothur.git] / trimseqscommand.h

diff --git a/trimseqscommand.h b/trimseqscommand.h
index 20b11a85ac05e57b453906475d73ab4fd2ecb2e0..137cb735719fba42f0d103af842de80c9930cc3e 100644 (file)
--- a/trimseqscommand.h
+++ b/trimseqscommand.h
@@ -14,44 +14,47 @@
 #include "command.hpp"
 #include "sequence.hpp"
 #include "qualityscores.h"
+#include "groupmap.h"
 
 class TrimSeqsCommand : public Command {
 public:
        TrimSeqsCommand(string);
        TrimSeqsCommand();
-       ~TrimSeqsCommand();
-       vector<string> getRequiredParameters();
-       vector<string> getValidParameters();
-       vector<string> getRequiredFiles();
-       map<string, vector<string> > getOutputFiles() { return outputTypes; }
-       int execute();
-       void help();
+       ~TrimSeqsCommand(){}
        
-private:
+       vector<string> setParameters();
+       string getCommandName()                 { return "trim.seqs";   }
+       string getCommandCategory()             { return "Sequence Processing";         }
+       string getHelpString(); 
+       string getCitation() { return "http://www.mothur.org/wiki/Trim.seqs"; }
+       string getDescription()         { return "provides the preprocessing features needed to screen and sort pyrosequences"; }
 
+       int execute(); 
+       void help() { m->mothurOut(getHelpString()); }  
+       
+private:
+       
+       GroupMap* groupMap;
+       
        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) {}
        };
-
-       void getOligos(vector<string>&, vector<string>&);
-       int stripBarcode(Sequence&, QualityScores&, int&);
-       int stripForward(Sequence&, QualityScores&, int&);
-       bool stripReverse(Sequence&, QualityScores&);
+       
+       bool getOligos(vector<vector<string> >&, vector<vector<string> >&, vector<vector<string> >&);
+       bool keepFirstTrim(Sequence&, QualityScores&);
+       bool removeLastTrim(Sequence&, QualityScores&);
        bool cullLength(Sequence&);
        bool cullHomoP(Sequence&);
        bool cullAmbigs(Sequence&);
-       bool compareDNASeq(string, string);
-       int countDiffs(string, string);
-       map<string, vector<string> > outputTypes;
 
-       bool abort;
-       string fastaFile, oligoFile, qFileName, outputDir;
+       bool abort, createGroup;
+       string fastaFile, oligoFile, qFileName, groupfile, nameFile, outputDir;
        
        bool flip, allFiles, qtrim;
        int numFPrimers, numRPrimers, maxAmbig, maxHomoP, minLength, maxLength, processors, tdiffs, bdiffs, pdiffs, comboStarts;
-       int qWindowSize, qWindowStep;
+       int qWindowSize, qWindowStep, keepFirst, removeLast;
        double qRollAverage, qThreshold, qWindowAverage, qAverage;
        vector<string> revPrimer, outputNames;
        set<string> filesToRemove;
@@ -59,15 +62,19 @@ private:
        vector<string> groupVector;
        map<string, int> primers;
        map<string, int> combos;
-       
+       map<string, int> groupToIndex;
+       vector<string> primerNameVector;        //needed here?
+       vector<string> barcodeNameVector;       //needed here?
+       map<string, int> groupCounts;  
+       map<string, string> nameMap;
+
        vector<int> processIDS;   //processid
        vector<linePair*> lines;
        vector<linePair*> qLines;
        
-       int driverCreateTrim(string, string, string, string, string, string, string, vector<string>, vector<string>, linePair*, linePair*);     
-       int createProcessesCreateTrim(string, string, string, string, string, string, string, vector<string>, vector<string>);
-       int setLines(string, string, vector<unsigned long int>&, vector<unsigned long int>&);
-       
+       int driverCreateTrim(string, string, string, string, string, string, string, string, string, vector<vector<string> >, vector<vector<string> >, vector<vector<string> >, linePair*, linePair*);  
+       int createProcessesCreateTrim(string, string, string, string, string, string, string, string, string, vector<vector<string> >, vector<vector<string> >, vector<vector<string> >);
+       int setLines(string, string, vector<unsigned long long>&, vector<unsigned long long>&);
 };
 
 #endif