X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=subsamplecommand.h;h=db4001a5c07337d51ea96aedfa9d3f20458b6685;hp=c746e144119dc4d4c0d45ef10872b1f7c9951129;hb=cf9987b67aa49777a4c91c2d21f96e58bf17aa82;hpb=49d2b7459c5027557564b21e9487dadafbbbdc96

diff --git a/subsamplecommand.h b/subsamplecommand.h
index c746e14..db4001a 100644
--- a/subsamplecommand.h
+++ b/subsamplecommand.h
@@ -16,6 +16,7 @@
 #include "rabundvector.hpp"
 #include "inputdata.h"
 #include "sequence.hpp"
+#include "counttable.h"
 
 
 class SubSampleCommand : public Command {
@@ -27,9 +28,10 @@ public:
 	
 	vector<string> setParameters();
 	string getCommandName()			{ return "sub.sample";	}
-	string getCommandCategory()		{ return "General";		}
-	string getOutputFileNameTag(string, string);
+	string getCommandCategory()		{ return "Sequence Processing";		}
+	
 	string getHelpString();	
+    string getOutputPattern(string);	
 	string getCitation() { return "http://www.mothur.org/wiki/Sub.sample"; }
 	string getDescription()		{ return "get a sampling of sequences from a list, shared, rabund, sabund or fasta file"; }
 
@@ -38,13 +40,14 @@ public:
 	
 private:	
 	bool abort, pickedGroups, allLines, persample;
-	string listfile, groupfile, sharedfile, rabundfile, sabundfile, fastafile, namefile;
+	string listfile, groupfile, countfile, sharedfile, rabundfile, sabundfile, fastafile, namefile, taxonomyfile;
 	set<string> labels; //holds labels to be used
 	string groups, label, outputDir;
 	vector<string> Groups, outputNames;
 	int size;
 	vector<string> names;
 	map<string, vector<string> > nameMap;
+    CountTable ct;
 	
 	int getSubSampleShared();
 	int getSubSampleList();
@@ -54,9 +57,10 @@ private:
 	int processShared(vector<SharedRAbundVector*>&);
 	int processRabund(RAbundVector*&, ofstream&);
 	int processSabund(SAbundVector*&, ofstream&);
-	int processList(ListVector*&, ofstream&, set<string>&);
+	int processList(ListVector*&, set<string>&);
 	int getNames();
 	int readNames();
+    int getTax(set<string>&);
 	
 };