X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=classifytreecommand.h;h=dd972b61b457378462392f771d759585bef53188;hb=6c2b1e530a5c0bb87040e58a3e410097acdfcc3d;hp=026e4bae414d227dab7750d623999b86d4aa4a73;hpb=91a27e0483827c06c21c4fe89558923bbfe86573;p=mothur.git

diff --git a/classifytreecommand.h b/classifytreecommand.h
index 026e4ba..dd972b6 100644
--- a/classifytreecommand.h
+++ b/classifytreecommand.h
@@ -12,6 +12,7 @@
 #include "command.hpp"
 #include "readtree.h"
 #include "treemap.h"
+#include "counttable.h"
 
 class ClassifyTreeCommand : public Command {
 public:
@@ -22,6 +23,7 @@ public:
 	vector<string> setParameters();
 	string getCommandName()			{ return "classify.tree";				}
 	string getCommandCategory()		{ return "Phylotype Analysis";          }
+	string getOutputFileNameTag(string, string);
 	string getHelpString();	
 	string getCitation() { return "http://www.mothur.org/wiki/Classify.tree"; }
 	string getDescription()		{ return "Find the consensus taxonomy for the descendant of each tree node"; }
@@ -30,21 +32,18 @@ public:
 	void help() { m->mothurOut(getHelpString()); }	
 	
 private:
-	ReadTree* read;
-    TreeMap* tmap;
-	string treefile, taxonomyfile, groupfile, namefile, outputDir;
+	string treefile, taxonomyfile, groupfile, namefile, countfile, outputDir;
 	bool abort;
 	vector<string> outputNames;
     int numUniquesInName, cutoff;
     map<string, string> nameMap;
     map<string, int> nameCount;
     map<string, string> taxMap;
+    CountTable* ct;
 	
 	int getClassifications(Tree*&);
 	map<string, set<string> > getDescendantList(Tree*&, int, map<int, map<string, set<string> > >);
     string getTaxonomy(set<string>, int&);
-    int readNamesFile(); 
-    int readTaxonomyFile();
 	
 };