]> git.donarmstrong.com Git - mothur.git/commitdiff
added shared file type to get.groups and remove.groups
authorwestcott <westcott>
Tue, 19 Jul 2011 13:53:57 +0000 (13:53 +0000)
committerwestcott <westcott>
Tue, 19 Jul 2011 13:53:57 +0000 (13:53 +0000)
corraxescommand.cpp
getgroupscommand.cpp
getgroupscommand.h
getseqscommand.cpp
normalizesharedcommand.cpp
removegroupscommand.cpp
removegroupscommand.h
removeseqscommand.cpp
sharedrabundfloatvector.cpp
sharedrabundvector.cpp
subsamplecommand.cpp

index 07c5707e0c195cf26596e5ef328af83994ebd031..ea98dfb4f35d91c0968898a9ab6ef931cc137d5c 100644 (file)
@@ -776,7 +776,7 @@ int CorrAxesCommand::eliminateZeroOTUS(vector<SharedRAbundFloatVector*>& thisloo
                                }
                                
                                //if there is a bin label use it otherwise make one
-                               string binLabel = "Otu" + (i+1);
+                               string binLabel = "Otu" + toString(i+1);
                                if (i < m->currentBinLabels.size()) {  binLabel = m->currentBinLabels[i]; }
                                
                                newBinLabels.push_back(binLabel);
index 0065ec1fc152b24a0bf4d78b2bd5f06a12f859be..d3470f16ad990d7285e51e534ad059666a03d097 100644 (file)
 #include "sequence.hpp"
 #include "listvector.hpp"
 #include "sharedutilities.h"
+#include "inputdata.h"
 
 //**********************************************************************************************************************
 vector<string> GetGroupsCommand::setParameters(){      
        try {
                CommandParameter pfasta("fasta", "InputTypes", "", "", "none", "FNGLT", "none",false,false); parameters.push_back(pfasta);
+               CommandParameter pshared("shared", "InputTypes", "", "", "none", "FNGLT-sharedGroup", "none",false,false); parameters.push_back(pshared);
                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 pgroup("group", "InputTypes", "", "", "none", "FNGLT-sharedGroup", "none",false,false); 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 paccnos("accnos", "InputTypes", "", "", "none", "none", "none",false,false); parameters.push_back(paccnos);
@@ -38,9 +40,9 @@ vector<string> GetGroupsCommand::setParameters(){
 string GetGroupsCommand::getHelpString(){      
        try {
                string helpString = "";
-               helpString += "The get.groups command selects 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 in the those specified groups.\n";
-               helpString += "The get.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 get.groups command selects sequences from a specfic group or set of groups from the following file types: fasta, name, group, list, taxonomy or shared file.\n";
+               helpString += "It outputs a file containing the sequences in the those specified groups, or a sharedfile containing only those groups.\n";
+               helpString += "The get.groups command parameters are accnos, fasta, name, group, list, taxonomy, shared and groups. The group parameter is required, unless you have a current group file, or are using a shared file.\n";
                helpString += "You must also provide an accnos containing the list of groups to get or set the groups parameter to the groups you wish to select.\n";
                helpString += "The groups parameter allows you to specify which of the groups in your groupfile you would like.  You can separate group names with dashes.\n";
                helpString += "The get.groups command should be in the following format: get.groups(accnos=yourAccnos, fasta=yourFasta, group=yourGroupFile).\n";
@@ -65,6 +67,7 @@ GetGroupsCommand::GetGroupsCommand(){
                outputTypes["name"] = tempOutNames;
                outputTypes["group"] = tempOutNames;
                outputTypes["list"] = tempOutNames;
+               outputTypes["shared"] = tempOutNames;
        }
        catch(exception& e) {
                m->errorOut(e, "GetGroupsCommand", "GetGroupsCommand");
@@ -101,6 +104,7 @@ GetGroupsCommand::GetGroupsCommand(string option)  {
                        outputTypes["name"] = tempOutNames;
                        outputTypes["group"] = tempOutNames;
                        outputTypes["list"] = tempOutNames;
+                       outputTypes["shared"] = tempOutNames;
                        
                        
                        //if the user changes the output directory command factory will send this info to us in the output parameter 
@@ -158,6 +162,14 @@ GetGroupsCommand::GetGroupsCommand(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;           }
+                               }
                        }
                        
                        
@@ -177,15 +189,6 @@ GetGroupsCommand::GetGroupsCommand(string option)  {
                        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; }
-                       }else { m->setGroupFile(groupfile); }   
-                       
                        listfile = validParameter.validFile(parameters, "list", true);
                        if (listfile == "not open") { abort = true; }
                        else if (listfile == "not found") {  listfile = "";  }
@@ -197,13 +200,54 @@ GetGroupsCommand::GetGroupsCommand(string option)  {
                        else { m->setTaxonomyFile(taxfile); }
                        
                        groups = validParameter.validFile(parameters, "groups", false);                 
-                       if (groups == "not found") { groups = "all"; }
-                       m->splitAtDash(groups, Groups);
+                       if (groups == "not found") { groups = ""; }
+                       else {
+                               m->splitAtDash(groups, Groups);
+                               m->Groups = 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 == "")) { 
+                               //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 { 
+                                                       m->mothurOut("You have no current groupfile or sharedfile 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 ((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 ((fastafile == "") && (namefile == "") && (groupfile == "")  && (sharedfile == "") && (listfile == "") && (taxfile == ""))  { m->mothurOut("You must provide at least one of the following: fasta, name, taxonomy, group, shared 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; }
+
                }
                
        }
@@ -219,22 +263,26 @@ int GetGroupsCommand::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 (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();
+                       util->setGroups(Groups, groupMap->namesOfGroups);
+                       delete util;
+                       
+                       //fill names with names of sequences that are from the groups we want to remove 
+                       fillNames();
+                       
+                       delete groupMap;
+               }
                
-               if (m->control_pressed) { delete groupMap; return 0; }
+               if (m->control_pressed) { return 0; }
                
                //read through the correct file and output lines you want to keep
                if (namefile != "")                     {               readName();             }
@@ -242,12 +290,10 @@ int GetGroupsCommand::execute(){
                if (groupfile != "")            {               readGroup();    }
                if (listfile != "")                     {               readList();             }
                if (taxfile != "")                      {               readTax();              }
+               if (sharedfile != "")           {               readShared();   }
                
                if (m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) {        m->mothurRemove(outputNames[i]); } return 0; }
                
-               m->mothurOut("Selected " + toString(names.size()) + " sequences. From the groups: "); m->mothurOutEndLine();
-               for (int i = 0; i < Groups.size(); i++) {       m->mothurOut(Groups[i]); m->mothurOut("\t" + toString(groupMap->getNumSeqs(Groups[i]))); m->mothurOutEndLine(); }
-               m->mothurOutEndLine();
                
                if (outputNames.size() != 0) {
                        m->mothurOutEndLine();
@@ -281,6 +327,11 @@ int GetGroupsCommand::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); }
+                       }
                }
                
                return 0;               
@@ -307,6 +358,7 @@ int GetGroupsCommand::readFasta(){
                string name;
                
                bool wroteSomething = false;
+               int selectedCount = 0;
                
                while(!in.eof()){
                        if (m->control_pressed) { in.close();  out.close();  m->mothurRemove(outputFileName);  return 0; }
@@ -320,6 +372,7 @@ int GetGroupsCommand::readFasta(){
                                        wroteSomething = true;
                                        
                                        currSeq.printSequence(out);
+                                       selectedCount++;
                                }
                        }
                        m->gobble(in);
@@ -330,6 +383,9 @@ int GetGroupsCommand::readFasta(){
                if (wroteSomething == false) {  m->mothurOut("Your file does NOT contain sequences from the groups you wish to get."); m->mothurOutEndLine();  }
                outputTypes["fasta"].push_back(outputFileName);  outputNames.push_back(outputFileName);
                
+               m->mothurOut("Selected " + toString(selectedCount) + " sequences from your fasta file."); m->mothurOutEndLine();
+
+               
                return 0;
                
        }
@@ -338,7 +394,59 @@ int GetGroupsCommand::readFasta(){
                exit(1);
        }
 }
-
+//**********************************************************************************************************************
+int GetGroupsCommand::readShared(){
+       try {
+               string thisOutputDir = outputDir;
+               if (outputDir == "") {  thisOutputDir += m->hasPath(sharedfile);  }
+               
+               InputData input(sharedfile, "sharedfile");
+               vector<SharedRAbundVector*> 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();
+               }
+               
+               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("Selected groups: " + groupsString + " from your shared file."); m->mothurOutEndLine();
+               
+               return 0;
+               
+       }
+       catch(exception& e) {
+               m->errorOut(e, "GetGroupsCommand", "readShared");
+               exit(1);
+       }
+}
 //**********************************************************************************************************************
 int GetGroupsCommand::readList(){
        try {
@@ -353,8 +461,12 @@ int GetGroupsCommand::readList(){
                m->openInputFile(listfile, in);
                
                bool wroteSomething = false;
+               int selectedCount = 0;
                
                while(!in.eof()){
+                       
+                       selectedCount = 0;
+                       
                        //read in list vector
                        ListVector list(in);
                        
@@ -375,11 +487,11 @@ int GetGroupsCommand::readList(){
                                        binnames = binnames.substr(binnames.find_first_of(',')+1, binnames.length());
                                        
                                        //if that name is in the .accnos file, add it
-                                       if (names.count(name) != 0) {  newNames += name + ",";  }
+                                       if (names.count(name) != 0) {  newNames += name + ",";  selectedCount++;  }
                                }
                                
                                //get last name
-                               if (names.count(binnames) != 0) {  newNames += binnames + ",";  }
+                               if (names.count(binnames) != 0) {  newNames += binnames + ",";  selectedCount++;  }
                                
                                //if there are names in this bin add to new list
                                if (newNames != "") {  
@@ -402,6 +514,8 @@ int GetGroupsCommand::readList(){
                if (wroteSomething == false) {  m->mothurOut("Your file does NOT contain sequences from the groups you wish to get."); m->mothurOutEndLine();  }
                outputTypes["list"].push_back(outputFileName); outputNames.push_back(outputFileName);
                
+               m->mothurOut("Selected " + toString(selectedCount) + " sequences from your list file."); m->mothurOutEndLine();
+               
                return 0;
                
        }
@@ -425,6 +539,7 @@ int GetGroupsCommand::readName(){
                string name, firstCol, secondCol;
                
                bool wroteSomething = false;
+               int selectedCount = 0;
                
                while(!in.eof()){
                        if (m->control_pressed) { in.close();  out.close();  m->mothurRemove(outputFileName);  return 0; }
@@ -442,6 +557,8 @@ int GetGroupsCommand::readName(){
                                }
                        }
                        
+                       selectedCount += 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) {
                                
@@ -477,6 +594,8 @@ int GetGroupsCommand::readName(){
                if (wroteSomething == false) {  m->mothurOut("Your file does NOT contain sequences from the groups you wish to get."); m->mothurOutEndLine();  }
                outputTypes["name"].push_back(outputFileName); outputNames.push_back(outputFileName);
                
+               m->mothurOut("Selected " + toString(selectedCount) + " sequences from your name file."); m->mothurOutEndLine();
+
                return 0;
        }
        catch(exception& e) {
@@ -500,6 +619,7 @@ int GetGroupsCommand::readGroup(){
                string name, group;
                
                bool wroteSomething = false;
+               int selectedCount = 0;
                
                while(!in.eof()){
                        if (m->control_pressed) { in.close();  out.close();  m->mothurRemove(outputFileName);  return 0; }
@@ -511,6 +631,7 @@ int GetGroupsCommand::readGroup(){
                        if (names.count(name) != 0) {
                                wroteSomething = true;
                                out << name << '\t' << group << endl;
+                               selectedCount++;
                        }
                        
                        m->gobble(in);
@@ -521,6 +642,8 @@ int GetGroupsCommand::readGroup(){
                if (wroteSomething == false) {  m->mothurOut("Your file does NOT contain sequences from the groups you wish to get."); m->mothurOutEndLine();  }
                outputTypes["group"].push_back(outputFileName); outputNames.push_back(outputFileName);
                
+               m->mothurOut("Selected " + toString(selectedCount) + " sequences from your group file."); m->mothurOutEndLine();
+
                return 0;
        }
        catch(exception& e) {
@@ -588,6 +711,8 @@ void GetGroupsCommand::readAccnos(){
                }
                in.close();             
                
+               m->Groups = Groups;
+               
        }
        catch(exception& e) {
                m->errorOut(e, "GetGroupsCommand", "readAccnos");
index 642107dafc9d567aa93270195740030d33698e52..6d766fb5ebab9f3910e998180bfa92003ca8a68f 100644 (file)
@@ -36,7 +36,7 @@ public:
        
 private:
        set<string> names;
-       string accnosfile, fastafile, namefile, groupfile, listfile, taxfile, outputDir, groups;
+       string accnosfile, fastafile, namefile, groupfile, listfile, taxfile, outputDir, groups, sharedfile;
        bool abort;
        vector<string> outputNames, Groups;
        GroupMap* groupMap;
@@ -48,6 +48,7 @@ private:
        int readList();
        int readTax();
        int fillNames();
+       int readShared();
        
 };
 
index 5eba5ccc67b02436fbe39e09cc8fca52a2ea89cc..ffe49b48810d7916e5324efd9480c87e8322ec92 100644 (file)
@@ -470,6 +470,8 @@ int GetSeqsCommand::readList(){
                
                while(!in.eof()){
                        
+                       selectedCount = 0;
+                       
                        if (m->control_pressed) { in.close(); out.close(); m->mothurRemove(outputFileName);  return 0; }
 
                        //read in list vector
index 1066ab7c33b81cbb230e9f8985fa101c65672c7b..51c755cc6bdc91d767e56c79771bfe1d81fef2c4 100644 (file)
@@ -643,7 +643,7 @@ int NormalizeSharedCommand::eliminateZeroOTUS(vector<SharedRAbundVector*>& thisl
                                        newLookup[j]->push_back(thislookup[j]->getAbundance(i), thislookup[j]->getGroup());
                                }
                                //if there is a bin label use it otherwise make one
-                               string binLabel = "Otu" + (i+1);
+                               string binLabel = "Otu" + toString(i+1);
                                if (i < m->currentBinLabels.size()) {  binLabel = m->currentBinLabels[i]; }
                                
                                newBinLabels.push_back(binLabel);
@@ -692,7 +692,7 @@ int NormalizeSharedCommand::eliminateZeroOTUS(vector<SharedRAbundFloatVector*>&
                                        newLookup[j]->push_back(thislookup[j]->getAbundance(i), thislookup[j]->getGroup());
                                }
                                //if there is a bin label use it otherwise make one
-                               string binLabel = "Otu" + (i+1);
+                               string binLabel = "Otu" + toString(i+1);
                                if (i < m->currentBinLabels.size()) {  binLabel = m->currentBinLabels[i]; }
                                
                                newBinLabels.push_back(binLabel);
index c9908fbc715f33eb33f75ff2005d51c9347678ff..252a92573d036c47f4d45235113adef1fc44727a 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 pshared("shared", "InputTypes", "", "", "none", "FNGLT-sharedGroup", "none",false,false); parameters.push_back(pshared);
                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 pgroup("group", "InputTypes", "", "", "none", "FNGLT-sharedGroup", "none",false,false); 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 paccnos("accnos", "InputTypes", "", "", "none", "none", "none",false,false); parameters.push_back(paccnos);
@@ -38,9 +40,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 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 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 +68,7 @@ RemoveGroupsCommand::RemoveGroupsCommand(){
                outputTypes["name"] = tempOutNames;
                outputTypes["group"] = tempOutNames;
                outputTypes["list"] = tempOutNames;
+               outputTypes["shared"] = tempOutNames;
        }
        catch(exception& e) {
                m->errorOut(e, "RemoveGroupsCommand", "RemoveGroupsCommand");
@@ -102,6 +105,7 @@ RemoveGroupsCommand::RemoveGroupsCommand(string option)  {
                        outputTypes["name"] = tempOutNames;
                        outputTypes["group"] = tempOutNames;
                        outputTypes["list"] = tempOutNames;
+                       outputTypes["shared"] = tempOutNames;
                        
                        
                        //if the user changes the output directory command factory will send this info to us in the output parameter 
@@ -159,41 +163,40 @@ 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;           }
+                               }
                        }
                        
                        
                        //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; }
-                       }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); }
                        
@@ -201,11 +204,50 @@ RemoveGroupsCommand::RemoveGroupsCommand(string option)  {
                        if (groups == "not found") { groups = ""; }
                        else { 
                                m->splitAtDash(groups, Groups);
+                               m->Groups = 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 == "")) { 
+                               //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 { 
+                                                       m->mothurOut("You have no current groupfile or sharedfile 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 == "")  && (listfile == "") && (taxfile == ""))  { m->mothurOut("You must provide at least one of the following: fasta, name, taxonomy, group or list."); m->mothurOutEndLine(); abort = true; }
+                       if ((fastafile == "") && (namefile == "") && (groupfile == "")  && (sharedfile == "") && (listfile == "") && (taxfile == ""))  { m->mothurOut("You must provide at least one of the following: fasta, name, taxonomy, group, shared 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; }
                }
                
        }
@@ -221,22 +263,26 @@ 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();
+                       util->setGroups(Groups, groupMap->namesOfGroups);
+                       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();             }
@@ -244,13 +290,10 @@ int RemoveGroupsCommand::execute(){
                if (groupfile != "")            {               readGroup();    }
                if (listfile != "")                     {               readList();             }
                if (taxfile != "")                      {               readTax();              }
+               if (sharedfile != "")           {               readShared();   }
                
                if (m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) {        m->mothurRemove(outputNames[i]); } 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("\t" + toString(groupMap->getNumSeqs(Groups[i]))); m->mothurOutEndLine(); }
-               m->mothurOutEndLine();
-               
+                               
                if (outputNames.size() != 0) {
                        m->mothurOutEndLine();
                        m->mothurOut("Output File names: "); m->mothurOutEndLine();
@@ -283,6 +326,11 @@ 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); }
+                       }
                }
                
                return 0;               
@@ -309,6 +357,7 @@ int RemoveGroupsCommand::readFasta(){
                string name;
                
                bool wroteSomething = false;
+               int removedCount = 0;
                
                while(!in.eof()){
                        if (m->control_pressed) { in.close();  out.close();  m->mothurRemove(outputFileName);  return 0; }
@@ -322,7 +371,7 @@ int RemoveGroupsCommand::readFasta(){
                                        wroteSomething = true;
                                        
                                        currSeq.printSequence(out);
-                               }
+                               }else { removedCount++; }
                        }
                        m->gobble(in);
                }
@@ -332,6 +381,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;
                
        }
@@ -340,7 +391,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->namesOfGroups;
+               vector<string> mothurOutGroups = m->Groups;
+               
+               vector<string> groupsToKeep;
+               for (int i = 0; i < allGroupsNames.size(); i++) {
+                       if (!m->inUsersGroups(allGroupsNames[i], m->Groups)) {
+                               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->Groups = 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->Groups = groupsToKeep;
+               m->namesOfGroups.clear();
+               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->Groups = 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 {
@@ -355,8 +490,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);
                        
@@ -378,10 +517,12 @@ int RemoveGroupsCommand::readList(){
                                        
                                        //if that name is in the .accnos file, add it
                                        if (names.count(name) == 0) {  newNames += name + ",";  }
+                                       else { removedCount++; }
                                }
                                
                                //get last name
                                if (names.count(binnames) == 0) {  newNames += binnames + ",";  }
+                               else { removedCount++; }
                                
                                //if there are names in this bin add to new list
                                if (newNames != "") {  
@@ -404,6 +545,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;
                
        }
@@ -427,6 +570,7 @@ int RemoveGroupsCommand::readName(){
                string name, firstCol, secondCol;
                
                bool wroteSomething = false;
+               int removedCount = 0;
                
                while(!in.eof()){
                        if (m->control_pressed) { in.close();  out.close();  m->mothurRemove(outputFileName);  return 0; }
@@ -444,6 +588,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) {
@@ -480,6 +625,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) {
@@ -503,6 +650,7 @@ int RemoveGroupsCommand::readGroup(){
                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; }
@@ -514,7 +662,7 @@ int RemoveGroupsCommand::readGroup(){
                        if (names.count(name) == 0) {
                                wroteSomething = true;
                                out << name << '\t' << group << endl;
-                       }
+                       }else {  removedCount++;  }
                        
                        m->gobble(in);
                }
@@ -524,6 +672,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) {
@@ -545,6 +696,7 @@ int RemoveGroupsCommand::readTax(){
                string name, tax;
                
                bool wroteSomething = false;
+               int removedCount = 0;
                
                while(!in.eof()){
                        if (m->control_pressed) { in.close();  out.close();  m->mothurRemove(outputFileName);  return 0; }
@@ -556,7 +708,7 @@ int RemoveGroupsCommand::readTax(){
                        if (names.count(name) == 0) {
                                wroteSomething = true;
                                out << name << '\t' << tax << endl;
-                       }
+                       }else {  removedCount++;  }
                        
                        m->gobble(in);
                }
@@ -566,6 +718,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) {
@@ -589,7 +743,9 @@ void RemoveGroupsCommand::readAccnos(){
                        
                        m->gobble(in);
                }
-               in.close();             
+               in.close();     
+               
+               m->Groups = Groups;
                
        }
        catch(exception& e) {
index daf2066feade74af3239e12f3a48a7b314de0a4c..63c0bff316ceda8770afdf19c90bb8f1feed7e6e 100644 (file)
@@ -35,12 +35,13 @@ public:
        
 private:
        set<string> names;
-       string accnosfile, fastafile, namefile, groupfile, listfile, taxfile, outputDir, groups;
+       string accnosfile, fastafile, namefile, groupfile, listfile, taxfile, outputDir, groups, sharedfile;
        bool abort;
        vector<string> outputNames, Groups;
        GroupMap* groupMap;
        
        int readFasta();
+       int readShared();
        int readName();
        int readGroup();
        void readAccnos();
index abd3c23eaadb0001b518ac226e34148a9bcb2f07..59c9b348ba1af9b719f35ae12a249265c7fe9662 100644 (file)
@@ -450,6 +450,9 @@ int RemoveSeqsCommand::readList(){
                int removedCount = 0;
                
                while(!in.eof()){
+                       
+                       removedCount = 0;
+                       
                        //read in list vector
                        ListVector list(in);
                        
index 8d91d7ede187510f66b63b25c7488ce822aba966..a5e17c2454d615be3a1c75f8b57fbe54ef85acd8 100644 (file)
@@ -494,7 +494,7 @@ int SharedRAbundFloatVector::eliminateZeroOTUS(vector<SharedRAbundFloatVector*>&
                                        newLookup[j]->push_back(thislookup[j]->getAbundance(i), thislookup[j]->getGroup());
                                }
                                //if there is a bin label use it otherwise make one
-                               string binLabel = "Otu" + (i+1);
+                               string binLabel = "Otu" + toString(i+1);
                                if (i < m->currentBinLabels.size()) {  binLabel = m->currentBinLabels[i]; }
                                
                                newBinLabels.push_back(binLabel);
index 74fb1c51ebb37d10185dced775be0af3829a7c41..7952859bccb3048bd796bdb05f74d2d920ed9c05 100644 (file)
@@ -472,7 +472,7 @@ int SharedRAbundVector::eliminateZeroOTUS(vector<SharedRAbundVector*>& thislooku
                                        }
                                        
                                        //if there is a bin label use it otherwise make one
-                                       string binLabel = "Otu" + (i+1);
+                                       string binLabel = "Otu" + toString(i+1);
                                        if (i < m->currentBinLabels.size()) {  binLabel = m->currentBinLabels[i]; }
                                        
                                        newBinLabels.push_back(binLabel);
index e365441d69bfeebc826bff13f3be4728ae54a264..e22bfdeee61af9b179b5ec5af4254157494b9d56 100644 (file)
@@ -1539,7 +1539,7 @@ int SubSampleCommand::eliminateZeroOTUS(vector<SharedRAbundVector*>& thislookup)
                                        newLookup[j]->push_back(thislookup[j]->getAbundance(i), thislookup[j]->getGroup());
                                }
                                //if there is a bin label use it otherwise make one
-                               string binLabel = "Otu" + (i+1);
+                               string binLabel = "Otu" + toString(i+1);
                                if (i < m->currentBinLabels.size()) {  binLabel = m->currentBinLabels[i]; }
                                
                                newBinLabels.push_back(binLabel);