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

[mothur.git] / mgclustercommand.h

diff --git a/mgclustercommand.h b/mgclustercommand.h
index f16a8f0c5ebc75bf07039a54d910d266e418b94e..a51fec5b298991b976095c52b7944c2fbab84cb8 100644 (file)
--- a/mgclustercommand.h
+++ b/mgclustercommand.h
@@ -14,9 +14,10 @@
 #include "readblast.h"
 #include "sparsematrix.hpp"
 #include "nameassignment.hpp"
-#include "globaldata.hpp"
 #include "cluster.hpp"
 #include "hcluster.h"
+#include "rabundvector.hpp"
+#include "sabundvector.hpp"
 
 /**********************************************************************/
 
@@ -25,16 +26,18 @@ class MGClusterCommand : public Command {
 public:
        MGClusterCommand(string);
        MGClusterCommand();
-       ~MGClusterCommand();
-       vector<string> getRequiredParameters();
-       vector<string> getValidParameters();
-       vector<string> getRequiredFiles();
-       map<string, vector<string> > getOutputFiles() { return outputTypes; }
-       int execute();
-       void help();
+       ~MGClusterCommand(){}
+       
+       vector<string> setParameters();
+       string getCommandName()                 { return "mgcluster";                           }
+       string getCommandCategory()             { return "OTU-Based Approaches";        }
+       string getHelpString(); 
+       
+       int execute(); 
+       void help() { m->mothurOut(getHelpString()); }  
+       
        
 private:
-       GlobalData* globaldata;
        ReadBlast* read;
        NameAssignment* nameMap;
        Cluster* cluster;
@@ -43,7 +46,6 @@ private:
        ListVector oldList;
        vector<seqDist> overlapMatrix;
        vector<string> outputNames;
-       map<string, vector<string> > outputTypes;
        
        string blastfile, method, namefile, overlapFile, distFile, outputDir;
        ofstream sabundFile, rabundFile, listFile;