X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=filterseqscommand.h;h=1d2526fdca83114dcca76217917324d134bcc391;hb=aba5f8811829037b0a3004ef33f0ad4ed5e5fcf8;hp=4b7d0111f11f5712dc9075bf313ec695222c7d7c;hpb=a8c74e7c7283b5bd04d4bd084a28f0c32992416d;p=mothur.git

diff --git a/filterseqscommand.h b/filterseqscommand.h
index 4b7d011..1d2526f 100644
--- a/filterseqscommand.h
+++ b/filterseqscommand.h
@@ -11,36 +11,49 @@
  */
 
 #include "command.hpp"
-#include "globaldata.hpp"
-#include "readfasta.h"
-#include "readnexus.h"
-#include "readclustal.h"
-#include "readseqsphylip.h"
-
+#include "filters.h"
+#include "mpi.h"
 
+class Sequence;
 class FilterSeqsCommand : public Command {
 
 public:
-	FilterSeqsCommand();
+	FilterSeqsCommand(string);
 	~FilterSeqsCommand() {};
 	int execute();	
+	void help();
 	
 private:
-	void doHard();
-	void doTrump(Sequence);
-	void doVertical();
-	void doSoft();
-	void getFreqs(Sequence);
-	string filter;	
-	int alignmentLength;
+	struct linePair {
+		int start;
+		int num;
+		linePair(long int i, long int j) : start(i), num(j) {}
+	};
+	vector<linePair*> lines;
+	vector<int> processIDS;
+
+	string vertical, filter, fasta, hard, outputDir, filterFileName;
+	vector<string> fastafileNames;	
+	int alignmentLength, processors;
+	vector<int> bufferSizes;
+	vector<string> outputNames;
 
 	char trump;
-	bool vertical;
+	bool abort;
 	float soft;
 	int numSeqs;
 	
-	GlobalData* globaldata;	
-	vector<int> a, t, g, c, gap;
+	string createFilter();
+	int filterSequences();
+	int createProcessesCreateFilter(Filters&, string);
+	int createProcessesRunFilter(string, string);
+	int driverCreateFilter(Filters&, string, linePair*);
+	int driverRunFilter(string, string, string, linePair*);	
+	int driverMPIRun(istringstream&, MPI_File&);
+	int MPICreateFilter(Filters&, string);	
+	int setLines(string);
+	int parseBuffer(string, vector<string>&);
+	
 };
 
 #endif