X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=rarefactsharedcommand.h;h=1bcddb5257f56967a63b66f0740e648811509204;hb=8ef6687c1f586285d01c000cc5e359bf9c07c717;hp=ab870242000bb0b07f3e28078feba84bcce1de4c;hpb=58cf1d08fee8c64334979075fa57bcafb035a2ed;p=mothur.git

diff --git a/rarefactsharedcommand.h b/rarefactsharedcommand.h
index ab87024..1bcddb5 100644
--- a/rarefactsharedcommand.h
+++ b/rarefactsharedcommand.h
@@ -9,47 +9,40 @@
  *
  */
 
-#include <iostream>
-#include <fstream>
-#include <vector>
 #include "command.hpp"
-#include "sharedordervector.h"
-#include "sharedlistvector.h"
 #include "inputdata.h"
 #include "rarefact.h"
 #include "display.h"
-#include "readmatrix.hpp"
-
-/* The rarefaction.shared() command:
-	The rarefaction command generates a rarefaction curve from a given file representing several groups.  
-	The rarefaction.shared command can only be executed after a successful read.shared command. It outputs a file for each estimator you choose to use.  
-	The rarefaction.shared command parameters are label, line, iters, jumble and sharedrarefaction.  
-	No parameters are required, but you may not use both the line and label  parameters at the same time.  
-	The rarefaction command should be in the following format: rarefaction.shared(label=yourLabel, line=yourLines, iters=yourIters, 
-	jumble= yourJumble, sharedrarefaction=yourEstimators).  Example rarefaction.shared(label=unique-.01-.03, line=0,5,10, iters=10000, 
-	jumble=1, sharedrarefaction =sharedobserved).  The default values for jumble is 0 (meaning don’t jumble, if it’s set to 1 then it will jumble), 
-	iters is 1000 and sharedrarefaction is sharedobserved which calculates the shared rarefaction curve for the observed richness. 
-	 The valid sharedrarefaction estimator is sharedobserved. The label and line parameters are used to analyze specific lines in your input. */
-
+#include "readotu.h"
+#include "validcalculator.h"
 
 class GlobalData;
 
 class RareFactSharedCommand : public Command {
 	
 public:
-	RareFactSharedCommand();	
+	RareFactSharedCommand(string);
 	~RareFactSharedCommand();
 	int execute();	
+	void help();
 	
 private:
 	GlobalData* globaldata;
-	SharedListVector* SharedList;
-	ReadMatrix* read;
-	SharedOrderVector* order;
+	ReadOTUFile* read;
+	vector<SharedRAbundVector*> lookup;
 	InputData* input;
+	ValidCalculators* validCalculator;
 	Rarefact* rCurve;
 	vector<Display*> rDisplays;
-	int freq, nIters;
+	int nIters;
+	string format;
+	float freq;
+	
+	bool abort, allLines, jumble;
+	set<string> labels; //holds labels to be used
+	string label, calc, groups, outputDir;
+	vector<string>  Estimators, Groups, outputNames;
+
 
 };