fixed trim.seqs group counts by adding back in the primer group

[mothur.git] / trimseqscommand.h

diff --git a/trimseqscommand.h b/trimseqscommand.h
index 2f8fbd7c499559bf65f9f5393982bd00dddfbcc3..d40cfe3c5604d66009ba22b568b0df71f3688faa 100644 (file)
--- a/trimseqscommand.h
+++ b/trimseqscommand.h
@@ -37,11 +37,15 @@ private:
                unsigned long int end;
                linePair(unsigned long int i, unsigned long int j) : start(i), end(j) {}
        };
-
-       void getOligos(vector<string>&, vector<string>&);
+       
+       void getOligos(vector<vector<string> >&, vector<vector<string> >&);
        int stripBarcode(Sequence&, QualityScores&, int&);
        int stripForward(Sequence&, QualityScores&, int&);
        bool stripReverse(Sequence&, QualityScores&);
+       
+       bool keepFirstTrim(Sequence&, QualityScores&);
+       bool removeLastTrim(Sequence&, QualityScores&);
+
        bool cullLength(Sequence&);
        bool cullHomoP(Sequence&);
        bool cullAmbigs(Sequence&);
@@ -54,7 +58,7 @@ private:
        
        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;
@@ -63,15 +67,17 @@ private:
        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;  
+
        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 driverCreateTrim(string, string, string, string, string, string, string, vector<vector<string> >, vector<vector<string> >, linePair*, linePair*);   
+       int createProcessesCreateTrim(string, string, string, string, string, string, string, vector<vector<string> >, vector<vector<string> >);
        int setLines(string, string, vector<unsigned long int>&, vector<unsigned long int>&);
-       
 };
 
 #endif