modified trim.seqs to speed up the append with multiple processors

[mothur.git] / reversecommand.cpp

diff --git a/reversecommand.cpp b/reversecommand.cpp
index 4efcbcce17e7daeb102a3c3c98d4baedbc185093..7b58162d20d8ac1910323c2946f7f8b4c05299af 100644 (file)
--- a/reversecommand.cpp
+++ b/reversecommand.cpp
@@ -10,7 +10,54 @@
 #include "reversecommand.h"
 #include "sequence.hpp"
 
-
+//**********************************************************************************************************************
+vector<string> ReverseSeqsCommand::getValidParameters(){       
+       try {
+               string Array[] =  {"fasta", "outputdir","inputdir"};
+               vector<string> myArray (Array, Array+(sizeof(Array)/sizeof(string)));
+               return myArray;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "ReverseSeqsCommand", "getValidParameters");
+               exit(1);
+       }
+}
+//**********************************************************************************************************************
+ReverseSeqsCommand::ReverseSeqsCommand(){      
+       try {
+               abort = true;
+               //initialize outputTypes
+               vector<string> tempOutNames;
+               outputTypes["fasta"] = tempOutNames;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "ReverseSeqsCommand", "ReverseSeqsCommand");
+               exit(1);
+       }
+}
+//**********************************************************************************************************************
+vector<string> ReverseSeqsCommand::getRequiredParameters(){    
+       try {
+               string Array[] =  {"fasta"};
+               vector<string> myArray (Array, Array+(sizeof(Array)/sizeof(string)));
+               return myArray;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "ReverseSeqsCommand", "getRequiredParameters");
+               exit(1);
+       }
+}
+//**********************************************************************************************************************
+vector<string> ReverseSeqsCommand::getRequiredFiles(){ 
+       try {
+               vector<string> myArray;
+               return myArray;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "ReverseSeqsCommand", "getRequiredFiles");
+               exit(1);
+       }
+}
 //***************************************************************************************************************
 
 ReverseSeqsCommand::ReverseSeqsCommand(string option)  {
@@ -36,6 +83,10 @@ ReverseSeqsCommand::ReverseSeqsCommand(string option)  {
                                if (validParameter.isValidParameter(it->first, myArray, it->second) != true) {  abort = true;  }
                        }
                        
+                       //initialize outputTypes
+                       vector<string> tempOutNames;
+                       outputTypes["fasta"] = 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 = "";          }
@@ -44,7 +95,7 @@ ReverseSeqsCommand::ReverseSeqsCommand(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 +109,7 @@ ReverseSeqsCommand::ReverseSeqsCommand(string option)  {
                        //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 += hasPath(fasta); //if user entered a file with a path then preserve it      
+                               outputDir += m->hasPath(fasta); //if user entered a file with a path then preserve it   
                        }
 
                }
@@ -72,7 +123,7 @@ ReverseSeqsCommand::ReverseSeqsCommand(string option)  {
 
 void ReverseSeqsCommand::help(){
        try {
-               m->mothurOut("The reverse.seqs command reads a fastafile and ....\n");
+               m->mothurOut("The reverse.seqs command reads a fastafile and outputs a fasta file containing the reverse compliment.\n");
                m->mothurOut("The reverse.seqs command parameter is fasta and it is required.\n");
                m->mothurOut("The reverse.seqs command should be in the following format: \n");
                m->mothurOut("reverse.seqs(fasta=yourFastaFile) \n");   
@@ -96,14 +147,16 @@ int ReverseSeqsCommand::execute(){
                if (abort == true) { return 0; }
                
                ifstream inFASTA;
-               openInputFile(fasta, inFASTA);
+               m->openInputFile(fasta, inFASTA);
                
                ofstream outFASTA;
-               string reverseFile = outputDir + getRootName(getSimpleName(fasta)) + "rc" + getExtension(fasta);
-               openOutputFile(reverseFile, outFASTA);
+               string reverseFile = outputDir + m->getRootName(m->getSimpleName(fasta)) + "rc" + m->getExtension(fasta);
+               m->openOutputFile(reverseFile, outFASTA);
                
                while(!inFASTA.eof()){
-                       Sequence currSeq(inFASTA);  gobble(inFASTA);
+                       if (m->control_pressed) {  inFASTA.close();  outFASTA.close(); remove(reverseFile.c_str()); return 0; }
+                        
+                       Sequence currSeq(inFASTA);  m->gobble(inFASTA);
                        if (currSeq.getName() != "") {
                                currSeq.reverseComplement();
                                currSeq.printSequence(outFASTA);
@@ -112,9 +165,11 @@ int ReverseSeqsCommand::execute(){
                inFASTA.close();
                outFASTA.close();
                
+               if (m->control_pressed) {  remove(reverseFile.c_str()); return 0; }
+               
                m->mothurOutEndLine();
                m->mothurOut("Output File Name: "); m->mothurOutEndLine();
-               m->mothurOut(reverseFile); m->mothurOutEndLine();       
+               m->mothurOut(reverseFile); m->mothurOutEndLine();       outputNames.push_back(reverseFile); outputTypes["fasta"].push_back(reverseFile);
                m->mothurOutEndLine();