X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=subsamplecommand.h;h=b70050653fd5ded5a9b25b555efea08ae79b9565;hb=3a13eff5c26d6fc156a299c9fa7f5497bded94a0;hp=9f3e55bea25c3b47db441d618c80638b1ee2d404;hpb=4ad32478c7b1bbb464c839a6e133f5b517a3efec;p=mothur.git

diff --git a/subsamplecommand.h b/subsamplecommand.h
index 9f3e55b..b700506 100644
--- a/subsamplecommand.h
+++ b/subsamplecommand.h
@@ -32,14 +32,6 @@ public:
 	void help();
 	
 private:
-	
-	struct nameToBin {
-		string name;
-		int bin;
-		
-		nameToBin(string n, int b) : name(n), bin(b) {}
-	};
-	
 	GlobalData* globaldata;
 	
 	bool abort, pickedGroups, allLines;
@@ -49,12 +41,21 @@ private:
 	vector<string> Groups, outputNames;
 	map<string, vector<string> > outputTypes;
 	int size;
+	vector<string> names;
+	map<string, vector<string> > nameMap;
 	
 	int eliminateZeroOTUS(vector<SharedRAbundVector*>&);
 	int getSubSampleShared();
 	int getSubSampleList();
+	int getSubSampleRabund();
+	int getSubSampleSabund();
+	int getSubSampleFasta();
 	int processShared(vector<SharedRAbundVector*>&, ofstream&);
-	int processListGroup(ListVector*&, GroupMap*&, ofstream&, ofstream&);
+	int processRabund(RAbundVector*&, ofstream&);
+	int processSabund(SAbundVector*&, ofstream&);
+	int processList(ListVector*&, ofstream&, set<string>&);
+	int getNames();
+	int readNames();
 	
 };