X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=trimseqscommand.h;h=93e8c776918ec9fa2d6f661d7c178380a4f47d66;hb=6e81846c8e5b2614f6b06643a9f558fb0e6669fa;hp=a4a4215277fadbdb5857dea6d9e9319e233cad01;hpb=e21aedb9ffeabff18207d53e9cc5420d2e30a5b2;p=mothur.git

diff --git a/trimseqscommand.h b/trimseqscommand.h
index a4a4215..93e8c77 100644
--- a/trimseqscommand.h
+++ b/trimseqscommand.h
@@ -13,6 +13,7 @@
 #include "mothur.h"
 #include "command.hpp"
 #include "sequence.hpp"
+#include "qualityscores.h"
 
 class TrimSeqsCommand : public Command {
 public:
@@ -24,39 +25,42 @@ public:
 private:
 
 	struct linePair {
-		int start;
-		int num;
-		linePair(long int i, int j) : start(i), num(j) {}
+		unsigned long int start;
+		unsigned long int end;
+		linePair(unsigned long int i, unsigned long int j) : start(i), end(j) {}
 	};
 
-	void getOligos(vector<string>&);
-	bool stripQualThreshold(Sequence&, ifstream&);
-	bool cullQualAverage(Sequence&, ifstream&);
-	int stripBarcode(Sequence&, int&);
-	int stripForward(Sequence&);
-	bool stripReverse(Sequence&);
+	void getOligos(vector<string>&, vector<string>&);
+	int stripBarcode(Sequence&, QualityScores&, int&);
+	int stripForward(Sequence&, QualityScores&, int&);
+	bool stripReverse(Sequence&, QualityScores&);
 	bool cullLength(Sequence&);
 	bool cullHomoP(Sequence&);
 	bool cullAmbigs(Sequence&);
 	bool compareDNASeq(string, string);
-	int countDiffs(string, string);//, int, int&, int);
+	int countDiffs(string, string);
 
 	bool abort;
 	string fastaFile, oligoFile, qFileName, outputDir;
 	
 	bool flip, allFiles, qtrim;
-	int numFPrimers, numRPrimers, maxAmbig, maxHomoP, minLength, maxLength, qThreshold, qAverage, processors, tdiffs, bdiffs, pdiffs;
-	vector<string> forPrimer, revPrimer, outputNames;
+	int numFPrimers, numRPrimers, maxAmbig, maxHomoP, minLength, maxLength, processors, tdiffs, bdiffs, pdiffs, comboStarts;
+	int qWindowSize, qWindowStep;
+	double qRollAverage, qThreshold, qWindowAverage, qAverage;
+	vector<string> revPrimer, outputNames;
+	set<string> filesToRemove;
 	map<string, int> barcodes;
 	vector<string> groupVector;
+	map<string, int> primers;
+	map<string, int> combos;
 	
 	vector<int> processIDS;   //processid
 	vector<linePair*> lines;
 	vector<linePair*> qLines;
 	
-	int driverCreateTrim(string, string, string, string, string, vector<string>, linePair*, linePair*);	
-	int createProcessesCreateTrim(string, string, string, string, string, vector<string>);
-	int setLines(string, vector<linePair*>&);
+	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>&);
 	
 };