X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=rarefactsharedcommand.h;h=a210574002969c411be4d9e9c705af9d88c980f0;hb=2c97dd48b8e27ee0a6a86c7a082f4c504c3357c6;hp=54d0495fdc8a1ac5063c8c01ff24970cea2b02fb;hpb=e150b0b0664caec517485ee6d69dcdade6dcae77;p=mothur.git

diff --git a/rarefactsharedcommand.h b/rarefactsharedcommand.h
index 54d0495..a210574 100644
--- a/rarefactsharedcommand.h
+++ b/rarefactsharedcommand.h
@@ -26,8 +26,9 @@ public:
 	string getCommandName()			{ return "rarefaction.shared";		}
 	string getCommandCategory()		{ return "OTU-Based Approaches";	}
 	string getHelpString();	
-	string getCitation() { return "http://www.mothur.org/wiki/Rarefaction.shared"; }
-	
+	string getCitation() { return "Magurran AE (2004). Measuring biological diversity. Blackwell Pub.: Malden, Ma. \nhttp://www.mothur.org/wiki/Rarefaction.shared"; }
+	string getDescription()		{ return "generate inter-sample rarefaction curves using a re-sampling without replacement approach"; }
+
 	int execute(); 
 	void help() { m->mothurOut(getHelpString()); }	
 	
@@ -35,17 +36,18 @@ public:
 private:
 	
 	vector<SharedRAbundVector*> lookup;
-	InputData* input;
-	Rarefact* rCurve;
-	vector<Display*> rDisplays;
 	int nIters;
 	string format;
 	float freq;
 	
-	bool abort, allLines, jumble;
+     map<int, string> file2Group; //index in outputNames[i] -> group
+	bool abort, allLines, jumble, groupMode;
 	set<string> labels; //holds labels to be used
-	string label, calc, groups, outputDir, sharedfile;
-	vector<string>  Estimators, Groups, outputNames;
+	string label, calc, groups, outputDir, sharedfile, designfile;
+	vector<string>  Estimators, Groups, outputNames, Sets;
+    
+    int process(GroupMap&, string);
+    vector<string> createGroupFile(vector<string>&);
 
 };