removed read.dist, read.otu, read.tree and globaldata. added current to defaults...

[mothur.git] / clustercommand.h

diff --git a/clustercommand.h b/clustercommand.h
index 787f835a0f33d1d157aeab41568286c28a752520..368760ac9465c231674b84de2ffffa5b714382f2 100644 (file)
--- a/clustercommand.h
+++ b/clustercommand.h
@@ -10,7 +10,6 @@
  */
 
 #include "command.hpp"
-#include "globaldata.hpp"
 #include "rabundvector.hpp"
 #include "sabundvector.hpp"
 #include "listvector.hpp"
@@ -18,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).  
@@ -32,15 +30,16 @@ public:
        ClusterCommand(string);
        ClusterCommand();
        ~ClusterCommand();
-       vector<string> getRequiredParameters();
-       vector<string> getValidParameters();
-       vector<string> getRequiredFiles();
-       map<string, vector<string> > getOutputFiles() { return outputTypes; }
-       int execute();  
-       void help();
+       
+       vector<string> setParameters();
+       string getCommandName()                 { return "cluster";                                     }
+       string getCommandCategory()             { return "OTU-Based Approaches";        }
+       string getHelpString(); 
+       
+       int execute(); 
+       void help() { m->mothurOut(getHelpString()); }  
        
 private:
-       GlobalData* globaldata;
        Cluster* cluster;
        SparseMatrix* matrix;
        ListVector* list;
@@ -48,9 +47,9 @@ private:
        RAbundVector oldRAbund;
        ListVector oldList;
 
-       bool abort, hard;
+       bool abort, hard, sim;
 
-       string method, fileroot, tag, outputDir;
+       string method, fileroot, tag, outputDir, phylipfile, columnfile, namefile, format, distfile;
        double cutoff;
        string showabund, timing;
        int precision, length;
@@ -62,7 +61,6 @@ private:
        
        void printData(string label);
        vector<string> outputNames;
-       map<string, vector<string> > outputTypes;
 };
 
 #endif