fixed bug with tree reading

[mothur.git] / clustersplitcommand.h

diff --git a/clustersplitcommand.h b/clustersplitcommand.h
index c696329af7c14c1ff4252e3496a4905dd3faf2d4..bdefb420de685f6c790deae1589a737ec75c2543 100644 (file)
--- a/clustersplitcommand.h
+++ b/clustersplitcommand.h
@@ -16,23 +16,28 @@
 #include "listvector.hpp"
 #include "cluster.hpp"
 #include "sparsematrix.hpp"
-#include "globaldata.hpp"
 
 
 class ClusterSplitCommand : public Command {
        
 public:
        ClusterSplitCommand(string);
-       ~ClusterSplitCommand();
-       int execute();  
-       void help();
+       ClusterSplitCommand();
+       ~ClusterSplitCommand() {}
        
+       vector<string> setParameters();
+       string getCommandName()                 { return "cluster.split";               }
+       string getCommandCategory()             { return "Clustering";                  }
+       string getHelpString(); 
+       
+       int execute(); 
+       void help() { m->mothurOut(getHelpString()); }  
+
 private:
-       GlobalData* globaldata;
        vector<int> processIDS;   //processid
        vector<string> outputNames;
-
-       string method, fileroot, tag, outputDir, phylipfile, columnfile, namefile, distfile, format, showabund, timing, splitmethod, taxFile;
+       
+       string method, fileroot, tag, outputDir, phylipfile, columnfile, namefile, distfile, format, showabund, timing, splitmethod, taxFile, fastafile;
        double cutoff, splitcutoff;
        int precision, length, processors, taxLevelCutoff;
        bool print_start, abort, hard, large;
@@ -44,6 +49,7 @@ private:
        vector<string> cluster(vector< map<string, string> >, set<string>&);
        int mergeLists(vector<string>, map<float, int>, ListVector*);
        map<float, int> completeListFile(vector<string>, string, set<string>&, ListVector*&);
+       int createMergedDistanceFile(vector< map<string, string> >);
 };
 
 #endif