X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=rarefactcommand.h;h=7da0b2f9f5301d80302d97f7da23d1cd8fee12c1;hb=a5af3313f0221a8b41aa362d72eadb60a4dd6e27;hp=0da5f0c20548196ed65d6e200620a8b0d9009d39;hpb=58cf1d08fee8c64334979075fa57bcafb035a2ed;p=mothur.git

diff --git a/rarefactcommand.h b/rarefactcommand.h
index 0da5f0c..7da0b2f 100644
--- a/rarefactcommand.h
+++ b/rarefactcommand.h
@@ -9,48 +9,53 @@
  *
  */
 
-#include <iostream>
-#include <fstream>
-#include <vector>
 #include "command.hpp"
 #include "ordervector.hpp"
 #include "inputdata.h"
 #include "rarefact.h"
 #include "display.h"
-#include "readmatrix.hpp"
+#include "readotu.h"
+#include "validcalculator.h"
 
 
-/*The rarefaction() command:
-	The rarefaction command generates a rarefaction curve from a given file.  
-	The rarefaction command can only be executed after a successful read.list, read.sabund or read.rabund command, with one exception. 
-	The rarefaction command can be executed after a successful cluster command.  It will use the .list file from the output of the cluster. 
-	The rarefaction command outputs a file for each estimator you choose to use.  It is recommended to only use rarefaction estimator.  
-	The rarefaction command parameters are label, line, iters, freq, rarefaction.  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(label=yourLabel, line=yourLines, iters=yourIters, freq=yourFreq, rarefaction=yourEstimators). 
-	Example rarefaction(label=unique-.01-.03, line=0,5,10, iters=10000, freq=10, rarefaction=rarefaction-rchao-race-rjack-rbootstrap-rshannon-rnpshannon-rsimpson). 
-	The default values for iters is 1000, freq is 100, and rarefaction is rarefaction which calculates the rarefaction curve for the observed richness. 
-	The valid rarefaction estimators are: rarefaction-rchao-race-rjack-rbootstrap-rshannon-rnpshannon-rsimpson.  
-	Rarefaction is the only recommended estimator.  The label and line parameters are used to analyze specific lines in your input. */
-	
-
 class GlobalData;
 
 class RareFactCommand : public Command {
 	
 public:
+	RareFactCommand(string);
 	RareFactCommand();	
 	~RareFactCommand();
-	int execute();	
+	vector<string> getRequiredParameters();
+	vector<string> getValidParameters();
+	vector<string> getRequiredFiles();
+	map<string, vector<string> > getOutputFiles() { return outputTypes; }
+	int execute();
+	void help();	
 	
 private:
 	GlobalData* globaldata;
 	vector<Display*> rDisplays;
-	ReadMatrix* read;
+	ReadOTUFile* read;
 	OrderVector* order;
 	InputData* input;
+	ValidCalculators* validCalculator;
 	Rarefact* rCurve;
-	int freq, nIters;
+	int nIters, abund, processors;
+	float freq;
+	
+	bool abort, allLines;
+	set<string> labels; //holds labels to be used
+	string label, calc;
+	vector<string>  Estimators;
+	vector<string> inputFileNames, outputNames;
+	vector<string> groups;
+	map<string, vector<string> > outputTypes;
+	string outputDir;
+	
+	vector<string> parseSharedFile(string);
+
+
 };
 
 #endif