fixed bug with tree reading

[mothur.git] / hclustercommand.h

diff --git a/hclustercommand.h b/hclustercommand.h
index 8bbc655fd7c30a9708b8292a81de0bb6a7b6c478..9241e94c35441e1b0d09d3bddae9a76d8f6c4cc6 100644 (file)
--- a/hclustercommand.h
+++ b/hclustercommand.h
@@ -11,7 +11,6 @@
  */
 
 #include "command.hpp"
-#include "globaldata.hpp"
 #include "hcluster.h"
 #include "rabundvector.hpp"
 #include "sabundvector.hpp"
@@ -32,13 +31,20 @@
 class HClusterCommand : public Command {
        
 public:
-       HClusterCommand(string);        
-       ~HClusterCommand();
-       int execute();  
-       void help();
+       HClusterCommand(string);
+       HClusterCommand();      
+       ~HClusterCommand(){}
+       
+       vector<string> setParameters();
+       string getCommandName()                 { return "hcluster";    }
+       string getCommandCategory()             { return "Clustering";  }
+       string getHelpString(); 
+       
+       int execute(); 
+       void help() { m->mothurOut(getHelpString()); }  
+       
        
 private:
-       GlobalData* globaldata;
        HCluster* cluster;
        ListVector* list;
        RAbundVector* rabund;
@@ -46,7 +52,7 @@ private:
        ListVector oldList;
        ReadCluster* read;
        
-       bool abort, sorted, print_start;
+       bool abort, sorted, print_start, hard;
        string method, fileroot, tag, distfile, format, phylipfile, columnfile, namefile, sort, showabund, timing, outputDir;
        double cutoff;
        int precision, length;