fixed bug with tree reading

[mothur.git] / mgclustercommand.h

diff --git a/mgclustercommand.h b/mgclustercommand.h
index 9aa86d4441e5c5f1202a6d552fef31162337c00d..c23534f9dfd375cb34cc8c85963d17e8dbfee23d 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"
 
 /**********************************************************************/
 
@@ -24,32 +25,39 @@ class MGClusterCommand : public Command {
 
 public:
        MGClusterCommand(string);
-       ~MGClusterCommand();
-       int execute();
-       void help();
+       MGClusterCommand();
+       ~MGClusterCommand(){}
+       
+       vector<string> setParameters();
+       string getCommandName()                 { return "mgcluster";   }
+       string getCommandCategory()             { return "Clustering";  }
+       string getHelpString(); 
+       
+       int execute(); 
+       void help() { m->mothurOut(getHelpString()); }  
+       
        
 private:
-       GlobalData* globaldata;
        ReadBlast* read;
        NameAssignment* nameMap;
        Cluster* cluster;
        HCluster* hcluster;
        ListVector* list;
        ListVector oldList;
-       vector<DistNode> overlapMatrix;
-       DistNode next;
-
+       vector<seqDist> overlapMatrix;
+       vector<string> outputNames;
        
-       string blastfile, method, namefile, overlapFile, distFile;
+       string blastfile, method, namefile, overlapFile, distFile, outputDir;
        ofstream sabundFile, rabundFile, listFile;
-       float cutoff, penalty;
+       double cutoff;
+       float penalty;
        int precision, length, precisionLength;
-       bool abort, minWanted, hclusterWanted, exitedBreak, merge;
+       bool abort, minWanted, hclusterWanted, merge, hard;
        
        void printData(ListVector*);
        ListVector* mergeOPFs(map<string, int>, float);
        void sortHclusterFiles(string, string);
-       vector<DistNode> getSeqs(ifstream&);
+       vector<seqDist> getSeqs(ifstream&);
 
 };