X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=trimseqscommand.h;h=137cb735719fba42f0d103af842de80c9930cc3e;hb=8dd3c225255d7084e3aff8740aa4f1f1cabb367a;hp=03ee1f5745222a1e3fb154c22b4099d26e77d029;hpb=0470f6d037aacb3563c3f7010708120a4a67d4e6;p=mothur.git

diff --git a/trimseqscommand.h b/trimseqscommand.h
index 03ee1f5..137cb73 100644
--- a/trimseqscommand.h
+++ b/trimseqscommand.h
@@ -12,35 +12,69 @@
 
 #include "mothur.h"
 #include "command.hpp"
-#include "globaldata.hpp"
 #include "sequence.hpp"
+#include "qualityscores.h"
+#include "groupmap.h"
 
 class TrimSeqsCommand : public Command {
 public:
 	TrimSeqsCommand(string);
-	~TrimSeqsCommand();
-	int execute();
-	void help();
+	TrimSeqsCommand();
+	~TrimSeqsCommand(){}
+	
+	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:
-	void getOligos();
-	bool stripBarcode(Sequence&, string&);
-	bool stripForward(Sequence&);
-	bool stripReverse(Sequence&);
+	
+	GroupMap* groupMap;
+	
+	struct linePair {
+		unsigned long long start;
+		unsigned long long end;
+		linePair(unsigned long long i, unsigned long long j) : start(i), end(j) {}
+	};
+	
+	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 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, keepFirst, removeLast;
+	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;
+	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;
 	
-	GlobalData* globaldata;
-	OptionParser* parser;
-	map<string, string> parameters;
-	map<string, string>::iterator it;
-	bool abort;
-	string fastafile;
-	bool oligos, flip;
-	int numFPrimers, numRPrimers, maxAmbig, maxHomoP, minLength, maxLength;
-	vector<string> forPrimer, revPrimer;
-	map<string, string> barcodes;
+	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