Merge remote-tracking branch 'origin/master'

[mothur.git] / classifytreecommand.h

diff --git a/classifytreecommand.h b/classifytreecommand.h
index bd0e1ce4f084ccefae3fd8c088322dca1dc214b5..758a438dc068f0790aab0b8b309f32a0fb6f24a5 100644 (file)
--- a/classifytreecommand.h
+++ b/classifytreecommand.h
@@ -22,16 +22,15 @@ 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 concensus taxonomy for the descendant of each tree node"; }
+       string getDescription()         { return "Find the consensus taxonomy for the descendant of each tree node"; }
     
        int execute();
        void help() { m->mothurOut(getHelpString()); }  
        
 private:
-       ReadTree* read;
-    TreeMap* tmap;
        string treefile, taxonomyfile, groupfile, namefile, outputDir;
        bool abort;
        vector<string> outputNames;
@@ -43,8 +42,6 @@ private:
        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();
        
 };