X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=deconvolutecommand.h;h=88b7a382d4c175a14c243d21e97a7580cba9c32d;hb=15cde0905641f8adddc1cc704f8c064f760e7461;hp=fe5c0db5587d9909fdad12d1f65cb916f5901043;hpb=c5c7502f435e1413c19e373dab1dfebcaa67588d;p=mothur.git

diff --git a/deconvolutecommand.h b/deconvolutecommand.h
index fe5c0db..88b7a38 100644
--- a/deconvolutecommand.h
+++ b/deconvolutecommand.h
@@ -11,27 +11,30 @@
 
 #include "command.hpp"
 #include "fastamap.h"
-#include "globaldata.hpp"
 
-/* The deconvolute command reads a fasta file, finds the duplicate sequences and outputs a names file
+/* The unique.seqs command reads a fasta file, finds the duplicate sequences and outputs a names file
 	containing 2 columns.  The first being the groupname and the second the list of identical sequence names. */ 
 
-using namespace std;
 
 class DeconvoluteCommand : public Command {
 
 public:
-	DeconvoluteCommand() {};	
-	~DeconvoluteCommand() { delete fastamap; };
-	int execute();	
+	DeconvoluteCommand(string);
+	DeconvoluteCommand();
+	~DeconvoluteCommand() {}
+	vector<string> getRequiredParameters();
+	vector<string> getValidParameters();
+	vector<string> getRequiredFiles();
+	map<string, vector<string> > getOutputFiles() { return outputTypes; }
+	int execute();
+	void help();	
 	
 private:
-	GlobalData* globaldata;
-	FastaMap* fastamap;
-	ifstream in;
-	ofstream out, outFasta;
-	string filename, outputFileName, outFastafile;
+	string inFastaName, oldNameMapFName, outputDir;
+	vector<string> outputNames;
+	map<string, vector<string> > outputTypes;
 
+	bool abort;
 };
 
 #endif