X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=filterseqscommand.h;h=232b0acb9966c19d0dafe9a3875dbc702e925754;hb=5d176c0f8049654ec3ae5a869c9ee3cecb991dc6;hp=3f1e4c46d349d9da15837466502bd06a2f243883;hpb=0470f6d037aacb3563c3f7010708120a4a67d4e6;p=mothur.git

diff --git a/filterseqscommand.h b/filterseqscommand.h
index 3f1e4c4..232b0ac 100644
--- a/filterseqscommand.h
+++ b/filterseqscommand.h
@@ -11,9 +11,10 @@
  */
 
 #include "command.hpp"
-#include "globaldata.hpp"
-#include "sequence.hpp"
+#include "filters.h"
+#include "mpi.h"
 
+class Sequence;
 class FilterSeqsCommand : public Command {
 
 public:
@@ -23,25 +24,26 @@ public:
 	void help();
 	
 private:
-	void doHard();
-	void doTrump(Sequence);
-	void doVertical();
-	void doSoft();
-	void getFreqs(Sequence);
-	string vertical, filter, fastafile, hard;	
-	int alignmentLength;
+	struct linePair {
+		int start;
+		int numSeqs;
+		linePair(long int i, int j) : start(i), numSeqs(j) {}
+	};
+	vector<linePair*> lines;
+
+
+	string vertical, filter, fasta, hard, outputDir, filterFileName;
+	vector<string> fastafileNames;	
+	int alignmentLength, processors;
 
 	char trump;
 	bool abort;
 	float soft;
 	int numSeqs;
-	OptionParser* parser;
-	map<string, string> parameters;
-	map<string, string>::iterator it;
 	
-	GlobalData* globaldata;	
-	vector<int> a, t, g, c, gap;
-
+	string createFilter();
+	int createProcessesCreateFilter(Filters&, string);
+	int driverCreateFilter(Filters&, string, linePair*);
 };
 
 #endif