X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=classifyotucommand.h;h=c0a822070fa9a8b0b570f05e1ede727e19ead48b;hp=a0baf1849d92935fec3ca360a135805d3c41ddbc;hb=050a3ff02473a3d4c0980964e1a9ebe52e55d6b8;hpb=74dc92cf53df65fd8b14d8eaf35489bbecbccac6

diff --git a/classifyotucommand.h b/classifyotucommand.h
index a0baf18..c0a8220 100644
--- a/classifyotucommand.h
+++ b/classifyotucommand.h
@@ -13,6 +13,7 @@
 #include "command.hpp"
 #include "listvector.hpp"
 #include "inputdata.h"
+#include "counttable.h"
 
 
 class ClassifyOtuCommand : public Command {
@@ -25,30 +26,31 @@ public:
 	vector<string> setParameters();
 	string getCommandName()			{ return "classify.otu";		}
 	string getCommandCategory()		{ return "Phylotype Analysis";	}
+	
 	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 getOutputPattern(string);	
+	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 77:3219.\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, refTaxonomy, groupfile, basis;
-	bool abort, allLines, probs;
+	string listfile, namefile, taxfile, label, outputDir, refTaxonomy, groupfile, basis, countfile;
+	bool abort, allLines, probs, persample;
 	int cutoff;
 	set<string> labels; //holds labels to be used
-	vector<string> outputNames;
+	vector<string> outputNames, groups;
 	map<string, string> nameMap;
 	map<string, string> taxMap;
 
-	int readNamesFile();
-	int readTaxonomyFile();
 	int process(ListVector*);
 	string addUnclassifieds(string, int);
-	vector<string> findConsensusTaxonomy(int, ListVector*, int&, string&); 	// returns the name of the "representative" taxonomy of given bin
+	vector<string> findConsensusTaxonomy(vector<string>, int&, string&); 	// returns the name of the "representative" taxonomy of given bin
 	
 												
 };