fixed read.tree so that it can read trees generated by fasttree

[mothur.git] / deconvolutecommand.h

diff --git a/deconvolutecommand.h b/deconvolutecommand.h
index c80bb360533a8b08e819d820d72f431f722c9e1b..9c8fd22d702f8a8b98ee12d682d6f880e5c1fb0e 100644 (file)
--- a/deconvolutecommand.h
+++ b/deconvolutecommand.h
@@ -10,29 +10,24 @@
  */
 
 #include "command.hpp"
-#include "utilities.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() { };
+       int execute();
+       void help();    
        
 private:
-       GlobalData* globaldata;
-       FastaMap* fastamap;
-       ifstream in;
-       ofstream out, outFasta;
-       string filename, outputFileName, outFastafile;
+       string inFastaName, oldNameMapFName, outputDir;
 
+       bool abort;
 };
 
 #endif