X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=rarefactcommand.h;h=9c7e1ed34fcffebaf73f4499bd6637d0d36c2b68;hb=b866e1519a60681527244036428104ad1cb90c93;hp=0bf8a4528025eafc3f0e16955e08fbf4553ea13b;hpb=8f7f4fc08b8c70d9ef0f79607813dba4e926e102;p=mothur.git

diff --git a/rarefactcommand.h b/rarefactcommand.h
index 0bf8a45..9c7e1ed 100644
--- a/rarefactcommand.h
+++ b/rarefactcommand.h
@@ -26,9 +26,11 @@ public:
 	vector<string> setParameters();
 	string getCommandName()			{ return "rarefaction.single";		}
 	string getCommandCategory()		{ return "OTU-Based Approaches";	}
+	string getOutputFileNameTag(string, string);
 	string getHelpString();	
 	string getCitation() { return "Magurran AE (2004). Measuring biological diversity. Blackwell Pub.: Malden, Ma. \nhttp://www.mothur.org/wiki/Rarefaction.single"; }
-	
+	string getDescription()		{ return "generate intra-sample rarefaction curves using a re-sampling without replacement approach"; }
+
 	int execute(); 
 	void help() { m->mothurOut(getHelpString()); }	
 	
@@ -41,7 +43,7 @@ private:
 	int nIters, abund, processors;
 	float freq;
 	
-	bool abort, allLines;
+	bool abort, allLines, groupMode;
 	set<string> labels; //holds labels to be used
 	string label, calc, sharedfile, listfile, rabundfile, sabundfile, format, inputfile;
 	vector<string>  Estimators;
@@ -49,7 +51,8 @@ private:
 	vector<string> groups;
 	string outputDir;
 	
-	vector<string> parseSharedFile(string);
+	vector<string> parseSharedFile(string, map<string, set<int> >&);
+	vector<string> createGroupFile(vector<string>&, map<int, string>);
 };
 
 #endif