cleaned up code2

[mothur.git] / clustercommand.h

diff --git a/clustercommand.h b/clustercommand.h
index 1487b3e8985420b096959fdb2737b8ce9f86e7c5..7349961e252104c93cf26942d79b44f11ba7c0f5 100644 (file)
--- a/clustercommand.h
+++ b/clustercommand.h
@@ -9,10 +9,6 @@
  *
  */
 
-#include <Carbon/Carbon.h>
-#include <iostream>
-#include <fstream>
-#include "globaldata.hpp"
 #include "command.hpp"
 #include "rabundvector.hpp"
 #include "sabundvector.hpp"
@@ -21,7 +17,6 @@
 #include "sparsematrix.hpp"
 
 /* The cluster() command:
-       The cluster command can only be executed after a successful read.phylip or read.column command.   
        The cluster command outputs a .list , .rabund and .sabund files.  
        The cluster command parameter options are method, cuttoff and precision. No parameters are required.  
        The cluster command should be in the following format: cluster(method=yourMethod, cutoff=yourCutoff, precision=yourPrecision).  
@@ -29,30 +24,46 @@
        The cluster() command outputs three files *.list, *.rabund, and *.sabund.   */
 
 
-class GlobalData;
-
 class ClusterCommand : public Command {
        
 public:
-       ClusterCommand();       
+       ClusterCommand(string);
+       ClusterCommand();
        ~ClusterCommand();
-       int execute();  
+       
+       vector<string> setParameters();
+       string getCommandName()                 { return "cluster";             }
+       string getCommandCategory()             { return "Clustering";  }
+       string getOutputFileNameTag(string, string);
+       string getHelpString(); 
+       string getCitation() { return "Schloss PD, Westcott SL (2011). Assessing and improving methods used in OTU-based approaches for 16S rRNA gene sequence analysis. Appl Environ Microbiol. \nhttp://www.mothur.org/wiki/Cluster"; }
+       string getDescription()         { return "cluster your sequences into OTUs using a distance matrix"; }
+       
+       int execute(); 
+       void help() { m->mothurOut(getHelpString()); }  
        
 private:
-       GlobalData* globaldata;
        Cluster* cluster;
        SparseMatrix* matrix;
        ListVector* list;
        RAbundVector* rabund;
        RAbundVector oldRAbund;
        ListVector oldList;
-       
-       string method, fileroot, tag;
+
+       bool abort, hard, sim;
+
+       string method, fileroot, tag, outputDir, phylipfile, columnfile, namefile, format, distfile;
        double cutoff;
+       string showabund, timing;
        int precision, length;
        ofstream sabundFile, rabundFile, listFile;
+
+       bool print_start;
+       time_t start;
+       unsigned long loops;
        
        void printData(string label);
+       vector<string> outputNames;
 };
 
-#endif
\ No newline at end of file
+#endif