cleaned up code2

[mothur.git] / rarefactsharedcommand.h

diff --git a/rarefactsharedcommand.h b/rarefactsharedcommand.h
index 2112e8d78565712a490de69bedd2ffb44844a768..a5b45468d7059ad2c9e8877376c0154102d05316 100644 (file)
--- a/rarefactsharedcommand.h
+++ b/rarefactsharedcommand.h
@@ -25,6 +25,7 @@ public:
        vector<string> setParameters();
        string getCommandName()                 { return "rarefaction.shared";          }
        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.shared"; }
        string getDescription()         { return "generate inter-sample rarefaction curves using a re-sampling without replacement approach"; }
@@ -36,17 +37,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>&);
 
 };