finished sub.sample command

[mothur.git] / subsamplecommand.h

diff --git a/subsamplecommand.h b/subsamplecommand.h
index 9f3e55bea25c3b47db441d618c80638b1ee2d404..b70050653fd5ded5a9b25b555efea08ae79b9565 100644 (file)
--- a/subsamplecommand.h
+++ b/subsamplecommand.h
@@ -32,14 +32,6 @@ public:
        void help();
        
 private:
-       
-       struct nameToBin {
-               string name;
-               int bin;
-               
-               nameToBin(string n, int b) : name(n), bin(b) {}
-       };
-       
        GlobalData* globaldata;
        
        bool abort, pickedGroups, allLines;
@@ -49,12 +41,21 @@ private:
        vector<string> Groups, outputNames;
        map<string, vector<string> > outputTypes;
        int size;
+       vector<string> names;
+       map<string, vector<string> > nameMap;
        
        int eliminateZeroOTUS(vector<SharedRAbundVector*>&);
        int getSubSampleShared();
        int getSubSampleList();
+       int getSubSampleRabund();
+       int getSubSampleSabund();
+       int getSubSampleFasta();
        int processShared(vector<SharedRAbundVector*>&, ofstream&);
-       int processListGroup(ListVector*&, GroupMap*&, ofstream&, ofstream&);
+       int processRabund(RAbundVector*&, ofstream&);
+       int processSabund(SAbundVector*&, ofstream&);
+       int processList(ListVector*&, ofstream&, set<string>&);
+       int getNames();
+       int readNames();
        
 };