]> git.donarmstrong.com Git - mothur.git/blobdiff - deconvolutecommand.cpp
fixes while testing
[mothur.git] / deconvolutecommand.cpp
index a936c820b56f88609e621894565359892384224a..dd05afdd0243132497fdab828c384b287ff0b61c 100644 (file)
@@ -9,8 +9,57 @@
 
 #include "deconvolutecommand.h"
 
+//**********************************************************************************************************************
+vector<string> DeconvoluteCommand::getValidParameters(){       
+       try {
+               string Array[] =  {"fasta", "name","outputdir","inputdir"};
+               vector<string> myArray (Array, Array+(sizeof(Array)/sizeof(string)));
+               return myArray;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "DeconvoluteCommand", "getValidParameters");
+               exit(1);
+       }
+}
+//**********************************************************************************************************************
+DeconvoluteCommand::DeconvoluteCommand(){      
+       try {
+               abort = true;
+               //initialize outputTypes
+               vector<string> tempOutNames;
+               outputTypes["fasta"] = tempOutNames;
+               outputTypes["name"] = tempOutNames;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "DeconvoluteCommand", "DeconvoluteCommand");
+               exit(1);
+       }
+}
+//**********************************************************************************************************************
+vector<string> DeconvoluteCommand::getRequiredParameters(){    
+       try {
+               string Array[] =  {"fasta"};
+               vector<string> myArray (Array, Array+(sizeof(Array)/sizeof(string)));
+               return myArray;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "DeconvoluteCommand", "getRequiredParameters");
+               exit(1);
+       }
+}
+//**********************************************************************************************************************
+vector<string> DeconvoluteCommand::getRequiredFiles(){ 
+       try {
+               vector<string> myArray;
+               return myArray;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "DeconvoluteCommand", "getRequiredFiles");
+               exit(1);
+       }
+}
 /**************************************************************************************/
-DeconvoluteCommand::DeconvoluteCommand(string option)        
+DeconvoluteCommand::DeconvoluteCommand(string option)  {       
        try {
                abort = false;
                
@@ -19,23 +68,58 @@ DeconvoluteCommand::DeconvoluteCommand(string option) {
                
                else {
                        //valid paramters for this command
-                       string Array[] =  {"fasta", "name"};
+                       string Array[] =  {"fasta", "name","outputdir","inputdir"};
                        vector<string> myArray (Array, Array+(sizeof(Array)/sizeof(string)));
                        
                        OptionParser parser(option);
                        map<string,string> parameters = parser.getParameters();
                        
                        ValidParameters validParameter;
+                       map<string, string>::iterator it;
                
                        //check to make sure all parameters are valid for command
-                       for (map<string, string>::iterator it = parameters.begin(); it != parameters.end(); it++) { 
+                       for (it = parameters.begin(); it != parameters.end(); it++) { 
                                if (validParameter.isValidParameter(it->first, myArray, it->second) != true) {  abort = true;  }
                        }
                        
+                       //initialize outputTypes
+                       vector<string> tempOutNames;
+                       outputTypes["fasta"] = tempOutNames;
+                       outputTypes["name"] = tempOutNames;
+               
+                       //if the user changes the input directory command factory will send this info to us in the output parameter 
+                       string inputDir = validParameter.validFile(parameters, "inputdir", false);              
+                       if (inputDir == "not found"){   inputDir = "";          }
+                       else {
+                               string path;
+                               it = parameters.find("fasta");
+                               //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["fasta"] = inputDir + it->second;            }
+                               }
+                               
+                               it = parameters.find("name");
+                               //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["name"] = inputDir + it->second;             }
+                               }
+                       }
+
+                       
                        //check for required parameters
                        inFastaName = validParameter.validFile(parameters, "fasta", true);
                        if (inFastaName == "not open") { abort = true; }
-                       else if (inFastaName == "not found") { inFastaName = ""; mothurOut("fasta is a required parameter for the unique.seqs command."); mothurOutEndLine(); abort = true;  }  
+                       else if (inFastaName == "not found") { inFastaName = ""; m->mothurOut("fasta is a required parameter for the unique.seqs command."); m->mothurOutEndLine(); abort = true;  }    
+                       
+                       //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 = ""; 
+                               outputDir += m->hasPath(inFastaName); //if user entered a file with a path then preserve it     
+                       }
                        
                        oldNameMapFName = validParameter.validFile(parameters, "name", true);
                        if (oldNameMapFName == "not open") { abort = true; }
@@ -44,7 +128,7 @@ DeconvoluteCommand::DeconvoluteCommand(string option) {
 
        }
        catch(exception& e) {
-               errorOut(e, "DeconvoluteCommand", "DeconvoluteCommand");
+               m->errorOut(e, "DeconvoluteCommand", "DeconvoluteCommand");
                exit(1);
        }
 }
@@ -52,15 +136,15 @@ DeconvoluteCommand::DeconvoluteCommand(string option) {
 
 void DeconvoluteCommand::help(){
        try {
-               mothurOut("The unique.seqs command reads a fastafile and creates a namesfile.\n");
-               mothurOut("It creates a file where the first column is the groupname and the second column is a list of sequence names who have the same sequence. \n");
-               mothurOut("If the sequence is unique the second column will just contain its name. \n");
-               mothurOut("The unique.seqs command parameter is fasta and it is required.\n");
-               mothurOut("The unique.seqs command should be in the following format: \n");
-               mothurOut("unique.seqs(fasta=yourFastaFile) \n");       
+               m->mothurOut("The unique.seqs command reads a fastafile and creates a namesfile.\n");
+               m->mothurOut("It creates a file where the first column is the groupname and the second column is a list of sequence names who have the same sequence. \n");
+               m->mothurOut("If the sequence is unique the second column will just contain its name. \n");
+               m->mothurOut("The unique.seqs command parameter is fasta and it is required.\n");
+               m->mothurOut("The unique.seqs command should be in the following format: \n");
+               m->mothurOut("unique.seqs(fasta=yourFastaFile) \n");    
        }
        catch(exception& e) {
-               errorOut(e, "DeconvoluteCommand", "help");
+               m->errorOut(e, "DeconvoluteCommand", "help");
                exit(1);
        }
 }
@@ -72,21 +156,34 @@ int DeconvoluteCommand::execute() {
                if (abort == true) { return 0; }
 
                //prepare filenames and open files
-               string outNameFile = (getRootName(inFastaName) + "names");
-               string outFastaFile = (getRootName(inFastaName) + "unique" + getExtension(inFastaName));
+               string outNameFile = outputDir + m->getRootName(m->getSimpleName(inFastaName)) + "names";
+               string outFastaFile = outputDir + m->getRootName(m->getSimpleName(inFastaName)) + "unique" + m->getExtension(inFastaName);
                
                FastaMap fastamap;
        
                if(oldNameMapFName == "")       {       fastamap.readFastaFile(inFastaName);                                    }
                else                                            {       fastamap.readFastaFile(inFastaName, oldNameMapFName);   }
                
+               if (m->control_pressed) { return 0; }
+               
                fastamap.printCondensedFasta(outFastaFile);
                fastamap.printNamesFile(outNameFile);
                
+               if (m->control_pressed) { outputTypes.clear(); remove(outFastaFile.c_str()); remove(outNameFile.c_str()); return 0; }
+               
+               m->mothurOutEndLine();
+               m->mothurOut("Output File Names: "); m->mothurOutEndLine();
+               m->mothurOut(outFastaFile); m->mothurOutEndLine();      
+               m->mothurOut(outNameFile); m->mothurOutEndLine();
+               outputNames.push_back(outFastaFile);  outputNames.push_back(outNameFile); outputTypes["fasta"].push_back(outFastaFile);  outputTypes["name"].push_back(outNameFile); 
+               m->mothurOutEndLine();
+
+
+               
                return 0;
        }
        catch(exception& e) {
-               errorOut(e, "DeconvoluteCommand", "execute");
+               m->errorOut(e, "DeconvoluteCommand", "execute");
                exit(1);
        }
 }