X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=classifyotucommand.h;h=45e377c3cbe1ac1ad735cd9c4f47d4c4c37c30a5;hb=ea4f373c28543cd1002b0dd7dc6e55c526647d59;hp=1077781e59b998892d699bf09b34c897a0a15375;hpb=8130ff9b30d872c578963f8d6f24af821b1ec33c;p=mothur.git

diff --git a/classifyotucommand.h b/classifyotucommand.h
index 1077781..45e377c 100644
--- a/classifyotucommand.h
+++ b/classifyotucommand.h
@@ -13,21 +13,33 @@
 #include "command.hpp"
 #include "listvector.hpp"
 #include "inputdata.h"
+#include "counttable.h"
 
 
 class ClassifyOtuCommand : public Command {
 
 public:
 	ClassifyOtuCommand(string);
-	~ClassifyOtuCommand();
-	int execute();
-	void help();
+	ClassifyOtuCommand();
+	~ClassifyOtuCommand() {}
+	
+	vector<string> setParameters();
+	string getCommandName()			{ return "classify.otu";		}
+	string getCommandCategory()		{ return "Phylotype Analysis";	}
+	string getOutputFileNameTag(string, string);
+	string getHelpString();	
+	string getCitation() { return "Schloss PD, Westcott SL (2011). Assessing and improving methods used in OTU-based approaches for 16S rRNA gene sequence analysis. Appl Environ Microbiol. \nhttp://www.mothur.org/wiki/Classify.otu"; }
+	string getDescription()		{ return "find the concensus taxonomy for each OTU"; }
+	
+	int execute(); 
+	void help() { m->mothurOut(getHelpString()); }	
 
 private:
-
+    GroupMap* groupMap;
+    CountTable* ct;
 	ListVector* list;
 	InputData* input;
-	string listfile, namefile, taxfile, label, outputDir;
+	string listfile, namefile, taxfile, label, outputDir, refTaxonomy, groupfile, basis, countfile;
 	bool abort, allLines, probs;
 	int cutoff;
 	set<string> labels; //holds labels to be used
@@ -35,11 +47,9 @@ private:
 	map<string, string> nameMap;
 	map<string, string> taxMap;
 
-	int readNamesFile();
-	int readTaxonomyFile();
-	void removeConfidences(string&);
 	int process(ListVector*);
-	string findConsensusTaxonomy(int, ListVector*, int&); 	// returns the name of the "representative" taxonomy of given bin
+	string addUnclassifieds(string, int);
+	vector<string> findConsensusTaxonomy(int, ListVector*, int&, string&); 	// returns the name of the "representative" taxonomy of given bin
 	
 												
 };