]> git.donarmstrong.com Git - mothur.git/blobdiff - getsharedotucommand.cpp
fixes while testing
[mothur.git] / getsharedotucommand.cpp
index d2e40887851e046fe4ab23f0985c5a76b4903478..699581f4fbf7f1eb45095316147990a4836ce7ac 100644 (file)
@@ -9,8 +9,58 @@
 
 #include "getsharedotucommand.h"
 
-//**********************************************************************************************************************
 
+//**********************************************************************************************************************
+vector<string> GetSharedOTUCommand::getValidParameters(){      
+       try {
+               string Array[] =  {"label","unique","shared","fasta","list","group","output","outputdir","inputdir"};
+               vector<string> myArray (Array, Array+(sizeof(Array)/sizeof(string)));
+               return myArray;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "GetSharedOTUCommand", "getValidParameters");
+               exit(1);
+       }
+}
+//**********************************************************************************************************************
+GetSharedOTUCommand::GetSharedOTUCommand(){    
+       try {
+               abort = true;
+               //initialize outputTypes
+               vector<string> tempOutNames;
+               outputTypes["fasta"] = tempOutNames;
+               outputTypes["accnos"] = tempOutNames;
+               outputTypes["sharedseqs"] = tempOutNames;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "GetSharedOTUCommand", "GetSharedOTUCommand");
+               exit(1);
+       }
+}
+//**********************************************************************************************************************
+vector<string> GetSharedOTUCommand::getRequiredParameters(){   
+       try {
+               string Array[] =  {"list","group"};
+               vector<string> myArray (Array, Array+(sizeof(Array)/sizeof(string)));
+               return myArray;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "GetSharedOTUCommand", "getRequiredParameters");
+               exit(1);
+       }
+}
+//**********************************************************************************************************************
+vector<string> GetSharedOTUCommand::getRequiredFiles(){        
+       try {
+               vector<string> myArray;
+               return myArray;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "GetSharedOTUCommand", "getRequiredFiles");
+               exit(1);
+       }
+}
+//**********************************************************************************************************************
 GetSharedOTUCommand::GetSharedOTUCommand(string option)  {
        try {
        
@@ -39,6 +89,12 @@ GetSharedOTUCommand::GetSharedOTUCommand(string option)  {
                                if (validParameter.isValidParameter(it->first, myArray, it->second) != true) {  abort = true;  }
                        }
                        
+                       //initialize outputTypes
+                       vector<string> tempOutNames;
+                       outputTypes["fasta"] = tempOutNames;
+                       outputTypes["accnos"] = tempOutNames;
+                       outputTypes["sharedseqs"] = tempOutNames;
+                       
                        //if the user changes the output directory command factory will send this info to us in the output parameter 
                        outputDir = validParameter.validFile(parameters, "outputdir", false);           if (outputDir == "not found"){  outputDir = "";         }
                        
@@ -50,7 +106,7 @@ GetSharedOTUCommand::GetSharedOTUCommand(string option)  {
                                it = parameters.find("fasta");
                                //user has given a template file
                                if(it != parameters.end()){ 
-                                       path = hasPath(it->second);
+                                       path = m->hasPath(it->second);
                                        //if the user has not given a path then, add inputdir. else leave path alone.
                                        if (path == "") {       parameters["fasta"] = inputDir + it->second;            }
                                }
@@ -58,7 +114,7 @@ GetSharedOTUCommand::GetSharedOTUCommand(string option)  {
                                it = parameters.find("list");
                                //user has given a template file
                                if(it != parameters.end()){ 
-                                       path = hasPath(it->second);
+                                       path = m->hasPath(it->second);
                                        //if the user has not given a path then, add inputdir. else leave path alone.
                                        if (path == "") {       parameters["list"] = inputDir + it->second;             }
                                }
@@ -66,7 +122,7 @@ GetSharedOTUCommand::GetSharedOTUCommand(string option)  {
                                it = parameters.find("group");
                                //user has given a template file
                                if(it != parameters.end()){ 
-                                       path = hasPath(it->second);
+                                       path = m->hasPath(it->second);
                                        //if the user has not given a path then, add inputdir. else leave path alone.
                                        if (path == "") {       parameters["group"] = inputDir + it->second;            }
                                }
@@ -90,7 +146,7 @@ GetSharedOTUCommand::GetSharedOTUCommand(string option)  {
                        label = validParameter.validFile(parameters, "label", false);                   
                        if (label == "not found") { label = ""; }
                        else { 
-                               if(label != "all") {  splitAtDash(label, labels);  allLines = 0;  }
+                               if(label != "all") {  m->splitAtDash(label, labels);  allLines = 0;  }
                                else { allLines = 1;  }
                        }
                        
@@ -101,7 +157,7 @@ GetSharedOTUCommand::GetSharedOTUCommand(string option)  {
                        if (groups == "not found") { groups = ""; }
                        else { 
                                userGroups = "unique." + groups;
-                               splitAtDash(groups, Groups);
+                               m->splitAtDash(groups, Groups);
                                globaldata->Groups = Groups;
                                
                        }
@@ -110,7 +166,7 @@ GetSharedOTUCommand::GetSharedOTUCommand(string option)  {
                        if (groups == "not found") { groups = "";  }
                        else { 
                                userGroups = groups;
-                               splitAtDash(groups, Groups);
+                               m->splitAtDash(groups, Groups);
                                globaldata->Groups = Groups;
                                unique = false;
                        }
@@ -188,12 +244,12 @@ int GetSharedOTUCommand::execute(){
                
                if (fastafile != "") {
                        ifstream inFasta;
-                       openInputFile(fastafile, inFasta);
+                       m->openInputFile(fastafile, inFasta);
                        
                        while(!inFasta.eof()) {
-                               if (m->control_pressed) { inFasta.close(); delete groupMap; return 0; }
+                               if (m->control_pressed) { outputTypes.clear(); inFasta.close(); delete groupMap; return 0; }
                                
-                               Sequence seq(inFasta); gobble(inFasta);
+                               Sequence seq(inFasta); m->gobble(inFasta);
                                if (seq.getName() != "") {  seqs.push_back(seq);   }
                        }
                        inFasta.close();
@@ -207,14 +263,14 @@ int GetSharedOTUCommand::execute(){
                set<string> userLabels = labels;
                
                ifstream in;
-               openInputFile(listfile, in);
+               m->openInputFile(listfile, in);
                
                //as long as you are not at the end of the file or done wih the lines you want
                while((!in.eof()) && ((allLines == 1) || (userLabels.size() != 0))) {
                        
                        if (m->control_pressed) { 
                                if (lastlist != NULL) {         delete lastlist;        }
-                               for (int i = 0; i < outputNames.size(); i++) {  remove(outputNames[i].c_str()); }  
+                               for (int i = 0; i < outputNames.size(); i++) {  remove(outputNames[i].c_str()); }  outputTypes.clear();
                                delete groupMap; return 0;
                        }
                        
@@ -228,7 +284,7 @@ int GetSharedOTUCommand::execute(){
                                userLabels.erase(list->getLabel());
                        }
                        
-                       if ((anyLabelsToProcess(list->getLabel(), userLabels, "") == true) && (processedLabels.count(lastLabel) != 1)) {
+                       if ((m->anyLabelsToProcess(list->getLabel(), userLabels, "") == true) && (processedLabels.count(lastLabel) != 1)) {
                                        string saveLabel = list->getLabel();
                                        
                                        m->mothurOut(lastlist->getLabel()); 
@@ -277,7 +333,7 @@ int GetSharedOTUCommand::execute(){
                
                if (lastlist != NULL) {         delete lastlist;        }
                
-               if (m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) {        remove(outputNames[i].c_str()); }  delete groupMap; return 0; } 
+               if (m->control_pressed) { outputTypes.clear(); for (int i = 0; i < outputNames.size(); i++) {   remove(outputNames[i].c_str()); }  delete groupMap; return 0; } 
                
                m->mothurOutEndLine();
                m->mothurOut("Output File Names: "); m->mothurOutEndLine();
@@ -302,13 +358,13 @@ int GetSharedOTUCommand::process(ListVector* shared) {
                ofstream outNames;
                string outputFileNames;
                
-               if (outputDir == "") { outputDir += hasPath(listfile); }
+               if (outputDir == "") { outputDir += m->hasPath(listfile); }
                if (output != "accnos") {
-                       outputFileNames = outputDir + getRootName(getSimpleName(listfile)) + shared->getLabel() + userGroups + ".shared.seqs";
+                       outputFileNames = outputDir + m->getRootName(m->getSimpleName(listfile)) + shared->getLabel() + userGroups + ".shared.seqs";
                }else {
-                       outputFileNames = outputDir + getRootName(getSimpleName(listfile)) + shared->getLabel() + userGroups + ".accnos";
+                       outputFileNames = outputDir + m->getRootName(m->getSimpleName(listfile)) + shared->getLabel() + userGroups + ".accnos";
                }
-               openOutputFile(outputFileNames, outNames);
+               m->openOutputFile(outputFileNames, outNames);
                
                bool wroteSomething = false;
                int num = 0;
@@ -406,15 +462,17 @@ int GetSharedOTUCommand::process(ListVector* shared) {
                }else { 
                        m->mothurOut("\t" + toString(num)); m->mothurOutEndLine(); 
                        outputNames.push_back(outputFileNames);
+                       if (output != "accnos") { outputTypes["sharedseqs"].push_back(outputFileNames); }
+                       else { outputTypes["accnos"].push_back(outputFileNames); }
                }
                
                //if fasta file provided output new fasta file
                if ((fastafile != "") && wroteSomething) {
-                       if (outputDir == "") { outputDir += hasPath(fastafile); }
-                       string outputFileFasta = outputDir + getRootName(getSimpleName(fastafile)) + shared->getLabel() + userGroups + ".shared.fasta";
+                       if (outputDir == "") { outputDir += m->hasPath(fastafile); }
+                       string outputFileFasta = outputDir + m->getRootName(m->getSimpleName(fastafile)) + shared->getLabel() + userGroups + ".shared.fasta";
                        ofstream outFasta;
-                       openOutputFile(outputFileFasta, outFasta);
-                       outputNames.push_back(outputFileFasta);
+                       m->openOutputFile(outputFileFasta, outFasta);
+                       outputNames.push_back(outputFileFasta); outputTypes["fasta"].push_back(outputFileFasta);
                        
                        for (int k = 0; k < seqs.size(); k++) {
                                if (m->control_pressed) { outFasta.close(); return 0; }