fixes while testing 1.33.0

[mothur.git] / removegroupscommand.h

diff --git a/removegroupscommand.h b/removegroupscommand.h
index 63c0bff316ceda8770afdf19c90bb8f1feed7e6e..c6e9d645c9f7fff26e2c23c634b6264a4614e01b 100644 (file)
--- a/removegroupscommand.h
+++ b/removegroupscommand.h
@@ -25,9 +25,11 @@ public:
        vector<string> setParameters();
        string getCommandName()                 { return "remove.groups";                       }
        string getCommandCategory()             { return "OTU-Based Approaches";        }
+       
        string getHelpString(); 
+    string getOutputPattern(string);   
        string getCitation() { return "http://www.mothur.org/wiki/Remove.groups"; }
-       string getDescription()         { return "removes sequences from a list, fasta, name, group or taxonomy file from a given group or set of groups"; }
+       string getDescription()         { return "removes sequences from a list, fasta, name, group, shared, design or taxonomy file from a given group or set of groups"; }
        
        int execute(); 
        void help() { m->mothurOut(getHelpString()); }  
@@ -35,19 +37,24 @@ public:
        
 private:
        set<string> names;
-       string accnosfile, fastafile, namefile, groupfile, listfile, taxfile, outputDir, groups, sharedfile;
+       string accnosfile, fastafile, namefile, groupfile, countfile, designfile, listfile, taxfile, outputDir, groups, sharedfile;
        bool abort;
        vector<string> outputNames, Groups;
        GroupMap* groupMap;
+       map<string, string> uniqueToRedundant; //if a namefile is given and the first column name is not selected
+       //then the other files need to change the unique name in their file to match.
+       //only add the names that need to be changed to keep the map search quick
+       
        
        int readFasta();
        int readShared();
        int readName();
        int readGroup();
-       void readAccnos();
+    int readCount();
        int readList();
        int readTax();
        int fillNames();
+    int readDesign();
        
 };