]> git.donarmstrong.com Git - mothur.git/blobdiff - removegroupscommand.cpp
added significance scores to core.axes. added design file to get.groups and remove...
[mothur.git] / removegroupscommand.cpp
index 5a70b27456e782ddba0ab0c2a133ad1d9831a540..49674f57ea9c11a46bd987e587e3678b10fb1c4b 100644 (file)
 #include "sequence.hpp"
 #include "listvector.hpp"
 #include "sharedutilities.h"
+#include "inputdata.h"
 
 //**********************************************************************************************************************
 vector<string> RemoveGroupsCommand::setParameters(){   
        try {
-               CommandParameter pfasta("fasta", "InputTypes", "", "", "none", "FNGLT", "none",false,false); parameters.push_back(pfasta);
-               CommandParameter pname("name", "InputTypes", "", "", "none", "FNGLT", "none",false,false); parameters.push_back(pname);
-               CommandParameter pgroup("group", "InputTypes", "", "", "none", "FNGLT", "none",false,true); parameters.push_back(pgroup);
-               CommandParameter plist("list", "InputTypes", "", "", "none", "FNGLT", "none",false,false); parameters.push_back(plist);
-               CommandParameter ptaxonomy("taxonomy", "InputTypes", "", "", "none", "FNGLT", "none",false,false); parameters.push_back(ptaxonomy);
+               CommandParameter pfasta("fasta", "InputTypes", "", "", "none", "none", "FNGLT",false,false); parameters.push_back(pfasta);
+               CommandParameter pshared("shared", "InputTypes", "", "", "none", "sharedGroup", "none",false,false); parameters.push_back(pshared);
+               CommandParameter pname("name", "InputTypes", "", "", "none", "none", "none",false,false); parameters.push_back(pname);
+               CommandParameter pgroup("group", "InputTypes", "", "", "none", "sharedGroup", "FNGLT",false,false); parameters.push_back(pgroup);
+        CommandParameter pdesign("design", "InputTypes", "", "", "none", "sharedGroup", "FNGLT",false,false); parameters.push_back(pdesign);
+               CommandParameter plist("list", "InputTypes", "", "", "none", "none", "FNGLT",false,false); parameters.push_back(plist);
+               CommandParameter ptaxonomy("taxonomy", "InputTypes", "", "", "none", "none", "FNGLT",false,false); parameters.push_back(ptaxonomy);
                CommandParameter paccnos("accnos", "InputTypes", "", "", "none", "none", "none",false,false); parameters.push_back(paccnos);
                CommandParameter pgroups("groups", "String", "", "", "", "", "",false,false); parameters.push_back(pgroups);
                CommandParameter pinputdir("inputdir", "String", "", "", "", "", "",false,false); parameters.push_back(pinputdir);
@@ -38,9 +41,9 @@ vector<string> RemoveGroupsCommand::setParameters(){
 string RemoveGroupsCommand::getHelpString(){   
        try {
                string helpString = "";
-               helpString += "The remove.groups command removes sequences from a specfic group or set of groups from the following file types: fasta, name, group, list, taxonomy.\n";
-               helpString += "It outputs a file containing the sequences NOT in the those specified groups.\n";
-               helpString += "The remove.groups command parameters are accnos, fasta, name, group, list, taxonomy and groups. The group parameter is required, unless you have a current group file.\n";
+               helpString += "The remove.groups command removes sequences from a specfic group or set of groups from the following file types: fasta, name, group, list, taxonomy, design or sharedfile.\n";
+               helpString += "It outputs a file containing the sequences NOT in the those specified groups, or with a sharedfile eliminates the groups you selected.\n";
+               helpString += "The remove.groups command parameters are accnos, fasta, name, group, list, taxonomy, shared, design and groups. The group parameter is required, unless you have a current group file or are using a sharedfile.\n";
                helpString += "You must also provide an accnos containing the list of groups to remove or set the groups parameter to the groups you wish to remove.\n";
                helpString += "The groups parameter allows you to specify which of the groups in your groupfile you would like removed.  You can separate group names with dashes.\n";
                helpString += "The remove.groups command should be in the following format: remove.groups(accnos=yourAccnos, fasta=yourFasta, group=yourGroupFile).\n";
@@ -66,6 +69,8 @@ RemoveGroupsCommand::RemoveGroupsCommand(){
                outputTypes["name"] = tempOutNames;
                outputTypes["group"] = tempOutNames;
                outputTypes["list"] = tempOutNames;
+               outputTypes["shared"] = tempOutNames;
+        outputTypes["design"] = tempOutNames;
        }
        catch(exception& e) {
                m->errorOut(e, "RemoveGroupsCommand", "RemoveGroupsCommand");
@@ -102,6 +107,8 @@ RemoveGroupsCommand::RemoveGroupsCommand(string option)  {
                        outputTypes["name"] = tempOutNames;
                        outputTypes["group"] = tempOutNames;
                        outputTypes["list"] = tempOutNames;
+                       outputTypes["shared"] = tempOutNames;
+            outputTypes["design"] = tempOutNames;
                        
                        
                        //if the user changes the output directory command factory will send this info to us in the output parameter 
@@ -159,48 +166,119 @@ RemoveGroupsCommand::RemoveGroupsCommand(string option)  {
                                        //if the user has not given a path then, add inputdir. else leave path alone.
                                        if (path == "") {       parameters["taxonomy"] = inputDir + it->second;         }
                                }
+                               
+                               it = parameters.find("shared");
+                               //user has given a template file
+                               if(it != parameters.end()){ 
+                                       path = m->hasPath(it->second);
+                                       //if the user has not given a path then, add inputdir. else leave path alone.
+                                       if (path == "") {       parameters["shared"] = inputDir + it->second;           }
+                               }
+                
+                it = parameters.find("design");
+                               //user has given a template file
+                               if(it != parameters.end()){ 
+                                       path = m->hasPath(it->second);
+                                       //if the user has not given a path then, add inputdir. else leave path alone.
+                                       if (path == "") {       parameters["design"] = inputDir + it->second;           }
+                               }
                        }
                        
                        
                        //check for required parameters
                        accnosfile = validParameter.validFile(parameters, "accnos", true);
-                       if (accnosfile == "not open") { abort = true; }
+                       if (accnosfile == "not open") { accnosfile = ""; abort = true; }
                        else if (accnosfile == "not found") {  accnosfile = ""; }       
+                       else { m->setAccnosFile(accnosfile); }
                        
                        fastafile = validParameter.validFile(parameters, "fasta", true);
-                       if (fastafile == "not open") { abort = true; }
+                       if (fastafile == "not open") { fastafile = ""; abort = true; }
                        else if (fastafile == "not found") {  fastafile = "";  }        
+                       else { m->setFastaFile(fastafile); }
                        
                        namefile = validParameter.validFile(parameters, "name", true);
-                       if (namefile == "not open") { abort = true; }
+                       if (namefile == "not open") { namefile = ""; abort = true; }
                        else if (namefile == "not found") {  namefile = "";  }  
+                       else { m->setNameFile(namefile); }
                        
                        groupfile = validParameter.validFile(parameters, "group", true);
-                       if (groupfile == "not open") { abort = true; }
-                       else if (groupfile == "not found") {            
-                               //if there is a current group file, use it
-                               groupfile = m->getGroupFile(); 
-                               if (groupfile != "") { m->mothurOut("Using " + groupfile + " as input file for the group parameter."); m->mothurOutEndLine(); }
-                               else {  m->mothurOut("You have no current groupfile and the group parameter is required."); m->mothurOutEndLine(); abort = true; }
-                       }       
+                       if (groupfile == "not open") { groupfile = "";  abort = true; }
+                       else if (groupfile == "not found") {    groupfile = "";         }
+                       else { m->setGroupFile(groupfile); }    
                        
                        listfile = validParameter.validFile(parameters, "list", true);
-                       if (listfile == "not open") { abort = true; }
+                       if (listfile == "not open") { listfile = ""; abort = true; }
                        else if (listfile == "not found") {  listfile = "";  }
+                       else { m->setListFile(listfile); }
                        
                        taxfile = validParameter.validFile(parameters, "taxonomy", true);
-                       if (taxfile == "not open") { abort = true; }
+                       if (taxfile == "not open") { taxfile = ""; abort = true; }
                        else if (taxfile == "not found") {  taxfile = "";  }
+                       else { m->setTaxonomyFile(taxfile); }
+            
+            designfile = validParameter.validFile(parameters, "design", true);
+                       if (designfile == "not open") { designfile = ""; abort = true; }
+                       else if (designfile == "not found") {  designfile = "";  }
+                       else { m->setDesignFile(designfile); }
                        
                        groups = validParameter.validFile(parameters, "groups", false);                 
                        if (groups == "not found") { groups = ""; }
                        else { 
                                m->splitAtDash(groups, Groups);
+                               m->setGroups(Groups);
+                       }
+                       
+                       sharedfile = validParameter.validFile(parameters, "shared", true);
+                       if (sharedfile == "not open") { sharedfile = ""; abort = true; }
+                       else if (sharedfile == "not found") {  sharedfile = "";  }
+                       else { m->setSharedFile(sharedfile); }
+                       
+                       groupfile = validParameter.validFile(parameters, "group", true);
+                       if (groupfile == "not open") { groupfile = ""; abort = true; }
+                       else if (groupfile == "not found") {    groupfile = ""; }
+                       else { m->setGroupFile(groupfile); }    
+                       
+                       if ((sharedfile == "") && (groupfile == "") && (designfile == "")) { 
+                               //is there are current file available for any of these?
+                               if ((namefile != "") || (fastafile != "") || (listfile != "") || (taxfile != "")) {
+                                       //give priority to group, then shared
+                                       groupfile = m->getGroupFile(); 
+                                       if (groupfile != "") {  m->mothurOut("Using " + groupfile + " as input file for the group parameter."); m->mothurOutEndLine(); }
+                                       else { 
+                                               sharedfile = m->getSharedFile(); 
+                                               if (sharedfile != "") { m->mothurOut("Using " + sharedfile + " as input file for the shared parameter."); m->mothurOutEndLine(); }
+                                               else { 
+                                                       m->mothurOut("You have no current groupfile or sharedfile and one is required."); m->mothurOutEndLine(); abort = true;
+                                               }
+                                       }
+                               }else {
+                                       //give priority to shared, then group
+                                       sharedfile = m->getSharedFile(); 
+                                       if (sharedfile != "") {  m->mothurOut("Using " + sharedfile + " as input file for the shared parameter."); m->mothurOutEndLine(); }
+                                       else { 
+                                               groupfile = m->getGroupFile(); 
+                                               if (groupfile != "") { m->mothurOut("Using " + groupfile + " as input file for the group parameter."); m->mothurOutEndLine(); }
+                                               else { 
+                                                       designfile = m->getDesignFile(); 
+                            if (designfile != "") { m->mothurOut("Using " + designfile + " as input file for the design parameter."); m->mothurOutEndLine(); }
+                            else { 
+                                m->mothurOut("You have no current groupfile or sharedfile or designfile and one is required."); m->mothurOutEndLine(); abort = true;
+                            }
+                                               }
+                                       }
+                               }
                        }
                        
-                       if ((accnosfile == "") && (Groups.size() == 0)) { m->mothurOut("You must provide an accnos file or specify groups using the groups parameter."); m->mothurOutEndLine(); abort = true; }
+                       if ((accnosfile == "") && (Groups.size() == 0)) { m->mothurOut("You must provide an accnos file containing group names or specify groups using the groups parameter."); m->mothurOutEndLine(); abort = true; }
+                       
+                       if ((fastafile == "") && (namefile == "") && (groupfile == "")  && (sharedfile == "") && (designfile == "") && (listfile == "") && (taxfile == ""))  { m->mothurOut("You must provide at least one of the following: fasta, name, taxonomy, group, shared, design or list."); m->mothurOutEndLine(); abort = true; }
+                       if ((groupfile == "") && ((namefile != "") || (fastafile != "") || (listfile != "") || (taxfile != "")))  { m->mothurOut("If using a fasta, name, taxonomy, group or list, then you must provide a group file."); m->mothurOutEndLine(); abort = true; }
                        
-                       if ((fastafile == "") && (namefile == "") && (groupfile == "")  && (listfile == "") && (taxfile == ""))  { m->mothurOut("You must provide at least one of the following: fasta, name, taxonomy, group or list."); m->mothurOutEndLine(); abort = true; }
+                       if ((namefile == "") && ((fastafile != "") || (taxfile != ""))){
+                               vector<string> files; files.push_back(fastafile); files.push_back(taxfile);
+                               parser.getNameFile(files);
+                       }
+               
                }
                
        }
@@ -216,22 +294,27 @@ int RemoveGroupsCommand::execute(){
                
                if (abort == true) { if (calledHelp) { return 0; }  return 2;   }
                
-               groupMap = new GroupMap(groupfile);
-               groupMap->readMap();
-               
                //get groups you want to remove
                if (accnosfile != "") { readAccnos(); }
                
-               //make sure groups are valid
-               //takes care of user setting groupNames that are invalid or setting groups=all
-               SharedUtil* util = new SharedUtil();
-               util->setGroups(Groups, groupMap->namesOfGroups);
-               delete util;
-               
-               //fill names with names of sequences that are from the groups we want to remove 
-               fillNames();
-               
-               if (m->control_pressed) { delete groupMap; return 0; }
+               if (groupfile != "") {
+                       groupMap = new GroupMap(groupfile);
+                       groupMap->readMap();
+                       
+                       //make sure groups are valid
+                       //takes care of user setting groupNames that are invalid or setting groups=all
+                       SharedUtil* util = new SharedUtil();
+                       vector<string> namesGroups = groupMap->getNamesOfGroups();
+                       util->setGroups(Groups, namesGroups);
+                       delete util;
+                       
+                       //fill names with names of sequences that are from the groups we want to remove 
+                       fillNames();
+                       
+                       delete groupMap;
+               }
+                               
+               if (m->control_pressed) { return 0; }
                
                //read through the correct file and output lines you want to keep
                if (namefile != "")                     {               readName();             }
@@ -239,13 +322,11 @@ int RemoveGroupsCommand::execute(){
                if (groupfile != "")            {               readGroup();    }
                if (listfile != "")                     {               readList();             }
                if (taxfile != "")                      {               readTax();              }
+               if (sharedfile != "")           {               readShared();   }
+        if (designfile != "")          {               readDesign();   }
                
-               if (m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) {        remove(outputNames[i].c_str()); } return 0; }
-               
-               m->mothurOut("Removed " + toString(names.size()) + " sequences. From the groups: "); m->mothurOutEndLine();
-               for (int i = 0; i < Groups.size(); i++) {       m->mothurOut(Groups[i]); m->mothurOut(" contains " + toString(groupMap->getNumSeqs(Groups[i])) + " sequences."); m->mothurOutEndLine(); }
-               m->mothurOutEndLine();
-               
+               if (m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) {        m->mothurRemove(outputNames[i]); } return 0; }
+                               
                if (outputNames.size() != 0) {
                        m->mothurOutEndLine();
                        m->mothurOut("Output File names: "); m->mothurOutEndLine();
@@ -278,6 +359,16 @@ int RemoveGroupsCommand::execute(){
                        if (itTypes != outputTypes.end()) {
                                if ((itTypes->second).size() != 0) { current = (itTypes->second)[0]; m->setTaxonomyFile(current); }
                        }
+                       
+                       itTypes = outputTypes.find("shared");
+                       if (itTypes != outputTypes.end()) {
+                               if ((itTypes->second).size() != 0) { current = (itTypes->second)[0]; m->setSharedFile(current); }
+                       }
+            
+            itTypes = outputTypes.find("design");
+                       if (itTypes != outputTypes.end()) {
+                               if ((itTypes->second).size() != 0) { current = (itTypes->second)[0]; m->setDesignFile(current); }
+                       }
                }
                
                return 0;               
@@ -304,9 +395,10 @@ int RemoveGroupsCommand::readFasta(){
                string name;
                
                bool wroteSomething = false;
+               int removedCount = 0;
                
                while(!in.eof()){
-                       if (m->control_pressed) { in.close();  out.close();  remove(outputFileName.c_str());  return 0; }
+                       if (m->control_pressed) { in.close();  out.close();  m->mothurRemove(outputFileName);  return 0; }
                        
                        Sequence currSeq(in);
                        name = currSeq.getName();
@@ -315,8 +407,15 @@ int RemoveGroupsCommand::readFasta(){
                                //if this name is in the accnos file
                                if (names.count(name) == 0) {
                                        wroteSomething = true;
-                                       
-                                       currSeq.printSequence(out);
+                                       currSeq.printSequence(out); 
+                               }else { 
+                                       //if you are not in the accnos file check if you are a name that needs to be changed
+                                       map<string, string>::iterator it = uniqueToRedundant.find(name);
+                                       if (it != uniqueToRedundant.end()) {
+                                               wroteSomething = true;
+                                               currSeq.setName(it->second);
+                                               currSeq.printSequence(out);
+                                       }else { removedCount++; }
                                }
                        }
                        m->gobble(in);
@@ -327,6 +426,8 @@ int RemoveGroupsCommand::readFasta(){
                if (wroteSomething == false) {  m->mothurOut("Your file contains only sequences from the groups you wish to remove."); m->mothurOutEndLine();  }
                outputTypes["fasta"].push_back(outputFileName);  outputNames.push_back(outputFileName);
                
+               m->mothurOut("Removed " + toString(removedCount) + " sequences from your fasta file."); m->mothurOutEndLine();
+               
                return 0;
                
        }
@@ -335,7 +436,91 @@ int RemoveGroupsCommand::readFasta(){
                exit(1);
        }
 }
+//**********************************************************************************************************************
+int RemoveGroupsCommand::readShared(){
+       try {
+               string thisOutputDir = outputDir;
+               if (outputDir == "") {  thisOutputDir += m->hasPath(sharedfile);  }
+               
+               //get group names from sharedfile so we can set Groups to the groupNames we want to keep
+               //that way we can take advantage of the reads in inputdata and sharedRabundVector
+               InputData* tempInput = new InputData(sharedfile, "sharedfile");
+               vector<SharedRAbundVector*> lookup = tempInput->getSharedRAbundVectors();
+       
+               //save m->Groups
+               vector<string> allGroupsNames = m->getAllGroups();
+               vector<string> mothurOutGroups = m->getGroups();
+               
+               vector<string> groupsToKeep;
+               for (int i = 0; i < allGroupsNames.size(); i++) {
+                       if (!m->inUsersGroups(allGroupsNames[i], m->getGroups())) {
+                               groupsToKeep.push_back(allGroupsNames[i]);
+                       }
+               }
+               
+               if (allGroupsNames.size() == groupsToKeep.size()) { m->mothurOut("Your file does not contain any groups you wish to remove."); m->mothurOutEndLine(); m->setGroups(mothurOutGroups); delete tempInput; for (int i = 0; i < lookup.size(); i++) {  delete lookup[i];  }  return 0; }
+               
+               //reset read 
+               for (int i = 0; i < lookup.size(); i++) {  delete lookup[i];  } 
+               delete tempInput;
+               m->setGroups(groupsToKeep);
+               m->clearAllGroups();
+               m->names.clear();
+               m->saveNextLabel = "";
+               m->printedHeaders = false;
+               m->currentBinLabels.clear();
+               m->binLabelsInFile.clear();
+               
+               InputData input(sharedfile, "sharedfile");
+               lookup = input.getSharedRAbundVectors();
 
+               bool wroteSomething = false;
+               
+               while(lookup[0] != NULL) {
+                       
+                       string outputFileName = thisOutputDir + m->getRootName(m->getSimpleName(sharedfile)) + lookup[0]->getLabel() + ".pick" + m->getExtension(sharedfile);
+                       ofstream out;
+                       m->openOutputFile(outputFileName, out);
+                       outputTypes["shared"].push_back(outputFileName);  outputNames.push_back(outputFileName);
+                       
+                       if (m->control_pressed) { out.close();  m->mothurRemove(outputFileName);  for (int i = 0; i < lookup.size(); i++) { delete lookup[i]; } return 0; }
+                       
+                       lookup[0]->printHeaders(out); 
+                       
+                       for (int i = 0; i < lookup.size(); i++) {
+                               out << lookup[i]->getLabel() << '\t' << lookup[i]->getGroup() << '\t';
+                               lookup[i]->print(out);
+                               wroteSomething = true;
+                               
+                       }                       
+                       
+                       //get next line to process
+                       //prevent memory leak
+                       for (int i = 0; i < lookup.size(); i++) {  delete lookup[i];  } 
+                       lookup = input.getSharedRAbundVectors();
+                       
+                       out.close();
+               }
+               
+               
+               m->setGroups(mothurOutGroups);
+               
+               if (wroteSomething == false) {  m->mothurOut("Your file contains only the groups you wish to remove."); m->mothurOutEndLine();  }
+               
+               string groupsString = "";
+               for (int i = 0; i < Groups.size()-1; i++) {     groupsString += Groups[i] + ", "; }
+               groupsString += Groups[Groups.size()-1];
+               
+               m->mothurOut("Removed groups: " + groupsString + " from your shared file."); m->mothurOutEndLine();
+               
+               return 0;
+               
+       }
+       catch(exception& e) {
+               m->errorOut(e, "RemoveGroupsCommand", "readShared");
+               exit(1);
+       }
+}
 //**********************************************************************************************************************
 int RemoveGroupsCommand::readList(){
        try {
@@ -350,8 +535,12 @@ int RemoveGroupsCommand::readList(){
                m->openInputFile(listfile, in);
                
                bool wroteSomething = false;
+               int removedCount = 0;
                
                while(!in.eof()){
+                       
+                       removedCount = 0;
+                       
                        //read in list vector
                        ListVector list(in);
                        
@@ -361,7 +550,7 @@ int RemoveGroupsCommand::readList(){
                        
                        //for each bin
                        for (int i = 0; i < list.getNumBins(); i++) {
-                               if (m->control_pressed) { in.close();  out.close();  remove(outputFileName.c_str());  return 0; }
+                               if (m->control_pressed) { in.close();  out.close();  m->mothurRemove(outputFileName);  return 0; }
                                
                                //parse out names that are in accnos file
                                string binnames = list.get(i);
@@ -373,10 +562,23 @@ int RemoveGroupsCommand::readList(){
                                        
                                        //if that name is in the .accnos file, add it
                                        if (names.count(name) == 0) {  newNames += name + ",";  }
+                                       else {
+                                               //if you are not in the accnos file check if you are a name that needs to be changed
+                                               map<string, string>::iterator it = uniqueToRedundant.find(name);
+                                               if (it != uniqueToRedundant.end()) {
+                                                       newNames += it->second + ",";
+                                               }else { removedCount++; }
+                                       }
                                }
                                
                                //get last name
                                if (names.count(binnames) == 0) {  newNames += binnames + ",";  }
+                               else { //if you are not in the accnos file check if you are a name that needs to be changed
+                                       map<string, string>::iterator it = uniqueToRedundant.find(binnames);
+                                       if (it != uniqueToRedundant.end()) {
+                                               newNames += it->second + ",";
+                                       }else { removedCount++; }
+                               }
                                
                                //if there are names in this bin add to new list
                                if (newNames != "") {  
@@ -399,6 +601,8 @@ int RemoveGroupsCommand::readList(){
                if (wroteSomething == false) {  m->mothurOut("Your file contains only sequences from the groups you wish to remove."); m->mothurOutEndLine();  }
                outputTypes["list"].push_back(outputFileName); outputNames.push_back(outputFileName);
                
+               m->mothurOut("Removed " + toString(removedCount) + " sequences from your list file."); m->mothurOutEndLine();
+               
                return 0;
                
        }
@@ -422,9 +626,10 @@ int RemoveGroupsCommand::readName(){
                string name, firstCol, secondCol;
                
                bool wroteSomething = false;
+               int removedCount = 0;
                
                while(!in.eof()){
-                       if (m->control_pressed) { in.close();  out.close();  remove(outputFileName.c_str());  return 0; }
+                       if (m->control_pressed) { in.close();  out.close();  m->mothurRemove(outputFileName);  return 0; }
                        
                        in >> firstCol;         m->gobble(in);          
                        in >> secondCol;                        
@@ -439,6 +644,7 @@ int RemoveGroupsCommand::readName(){
                                }
                        }
                        
+                       removedCount += parsedNames.size()-validSecond.size();
                        
                        //if the name in the first column is in the set then print it and any other names in second column also in set
                        if (names.count(firstCol) == 0) {
@@ -464,6 +670,7 @@ int RemoveGroupsCommand::readName(){
                                        //you know you have at least one valid second since first column is valid
                                        for (int i = 0; i < validSecond.size()-1; i++) {  out << validSecond[i] << ',';  }
                                        out << validSecond[validSecond.size()-1] << endl;
+                                       uniqueToRedundant[firstCol] = validSecond[0];
                                }
                        }
                        
@@ -475,6 +682,8 @@ int RemoveGroupsCommand::readName(){
                if (wroteSomething == false) {  m->mothurOut("Your file contains only sequences from the groups you wish to remove."); m->mothurOutEndLine();  }
                outputTypes["name"].push_back(outputFileName); outputNames.push_back(outputFileName);
                
+               m->mothurOut("Removed " + toString(removedCount) + " sequences from your name file."); m->mothurOutEndLine();
+               
                return 0;
        }
        catch(exception& e) {
@@ -498,9 +707,10 @@ int RemoveGroupsCommand::readGroup(){
                string name, group;
                
                bool wroteSomething = false;
+               int removedCount = 0;
                
                while(!in.eof()){
-                       if (m->control_pressed) { in.close();  out.close();  remove(outputFileName.c_str());  return 0; }
+                       if (m->control_pressed) { in.close();  out.close();  m->mothurRemove(outputFileName);  return 0; }
                        
                        in >> name;                             //read from first column
                        in >> group;                    //read from second column
@@ -509,7 +719,7 @@ int RemoveGroupsCommand::readGroup(){
                        if (names.count(name) == 0) {
                                wroteSomething = true;
                                out << name << '\t' << group << endl;
-                       }
+                       }else {  removedCount++;  }
                        
                        m->gobble(in);
                }
@@ -519,6 +729,9 @@ int RemoveGroupsCommand::readGroup(){
                if (wroteSomething == false) {  m->mothurOut("Your file contains only sequences from the groups you wish to remove."); m->mothurOutEndLine();  }
                outputTypes["group"].push_back(outputFileName); outputNames.push_back(outputFileName);
                
+               m->mothurOut("Removed " + toString(removedCount) + " sequences from your group file."); m->mothurOutEndLine();
+
+               
                return 0;
        }
        catch(exception& e) {
@@ -526,6 +739,54 @@ int RemoveGroupsCommand::readGroup(){
                exit(1);
        }
 }
+//**********************************************************************************************************************
+int RemoveGroupsCommand::readDesign(){
+       try {
+               string thisOutputDir = outputDir;
+               if (outputDir == "") {  thisOutputDir += m->hasPath(designfile);  }
+               string outputFileName = thisOutputDir + m->getRootName(m->getSimpleName(designfile)) + "pick" + m->getExtension(designfile);
+               
+               ofstream out;
+               m->openOutputFile(outputFileName, out);
+               
+               ifstream in;
+               m->openInputFile(designfile, in);
+               string name, group;
+               
+               bool wroteSomething = false;
+               int removedCount = 0;
+               
+               while(!in.eof()){
+                       if (m->control_pressed) { in.close();  out.close();  m->mothurRemove(outputFileName);  return 0; }
+                       
+                       in >> name;                             //read from first column
+                       in >> group;                    //read from second column
+                       
+                       //if this name is in the accnos file
+                       if (!(m->inUsersGroups(name, Groups))) {
+                               wroteSomething = true;
+                               out << name << '\t' << group << endl;
+                       }else {  removedCount++;  }
+                       
+                       m->gobble(in);
+               }
+               in.close();
+               out.close();
+               
+               if (wroteSomething == false) {  m->mothurOut("Your file contains only groups from the groups you wish to remove."); m->mothurOutEndLine();  }
+               outputTypes["design"].push_back(outputFileName); outputNames.push_back(outputFileName);
+               
+               m->mothurOut("Removed " + toString(removedCount) + " groups from your design file."); m->mothurOutEndLine();
+        
+               
+               return 0;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "RemoveGroupsCommand", "readDesign");
+               exit(1);
+       }
+}
+
 //**********************************************************************************************************************
 int RemoveGroupsCommand::readTax(){
        try {
@@ -540,9 +801,10 @@ int RemoveGroupsCommand::readTax(){
                string name, tax;
                
                bool wroteSomething = false;
+               int removedCount = 0;
                
                while(!in.eof()){
-                       if (m->control_pressed) { in.close();  out.close();  remove(outputFileName.c_str());  return 0; }
+                       if (m->control_pressed) { in.close();  out.close();  m->mothurRemove(outputFileName);  return 0; }
                        
                        in >> name;                             //read from first column
                        in >> tax;                      //read from second column
@@ -551,7 +813,12 @@ int RemoveGroupsCommand::readTax(){
                        if (names.count(name) == 0) {
                                wroteSomething = true;
                                out << name << '\t' << tax << endl;
-                       }
+                       }else {  //if you are not in the accnos file check if you are a name that needs to be changed
+                               map<string, string>::iterator it = uniqueToRedundant.find(name);
+                               if (it != uniqueToRedundant.end()) {
+                                       wroteSomething = true;
+                                       out << it->second << '\t' << tax << endl;
+                               }else { removedCount++; }  }
                        
                        m->gobble(in);
                }
@@ -561,6 +828,8 @@ int RemoveGroupsCommand::readTax(){
                if (wroteSomething == false) {  m->mothurOut("Your file contains only sequences from the groups you wish to remove."); m->mothurOutEndLine();  }
                outputTypes["taxonomy"].push_back(outputFileName); outputNames.push_back(outputFileName);
                
+               m->mothurOut("Removed " + toString(removedCount) + " sequences from your taxonomy file."); m->mothurOutEndLine();
+               
                return 0;
        }
        catch(exception& e) {
@@ -584,7 +853,9 @@ void RemoveGroupsCommand::readAccnos(){
                        
                        m->gobble(in);
                }
-               in.close();             
+               in.close();     
+               
+               m->setGroups(Groups);
                
        }
        catch(exception& e) {