fixed an mpi bug in shhh.seqs

[mothur.git] / classifyseqscommand.cpp

diff --git a/classifyseqscommand.cpp b/classifyseqscommand.cpp
index 3876c6c59066ee74da67ff673a8cbb5ab3501d54..2dfe05a05f9e267390c7e7656dee12d0ee1ab169 100644 (file)
--- a/classifyseqscommand.cpp
+++ b/classifyseqscommand.cpp
@@ -30,8 +30,7 @@ vector<string> ClassifySeqsCommand::getValidParameters(){
 //**********************************************************************************************************************
 ClassifySeqsCommand::ClassifySeqsCommand(){    
        try {
-               abort = true;
-               //initialize outputTypes
+               abort = true; calledHelp = true; 
                vector<string> tempOutNames;
                outputTypes["taxonomy"] = tempOutNames;
                outputTypes["taxsummary"] = tempOutNames;
@@ -68,10 +67,10 @@ vector<string> ClassifySeqsCommand::getRequiredFiles(){
 //**********************************************************************************************************************
 ClassifySeqsCommand::ClassifySeqsCommand(string option)  {
        try {
-               abort = false;
+               abort = false; calledHelp = false;   
                
                //allow user to run help
-               if(option == "help") { help(); abort = true; }
+               if(option == "help") { help(); abort = true; calledHelp = true; }
                
                else {
                        
@@ -421,7 +420,7 @@ void ClassifySeqsCommand::help(){
 
 int ClassifySeqsCommand::execute(){
        try {
-               if (abort == true) {    return 0;       }
+               if (abort == true) { if (calledHelp) { return 0; }  return 2;   }
                
                if(method == "bayesian"){       classify = new Bayesian(taxonomyFileName, templateFileName, search, kmerSize, cutoff, iters);           }
                else if(method == "knn"){       classify = new Knn(taxonomyFileName, templateFileName, search, kmerSize, gapOpen, gapExtend, match, misMatch, numWanted);                               }
@@ -461,7 +460,7 @@ int ClassifySeqsCommand::execute(){
                        for (int i = 0; i < lines.size(); i++) {  delete lines[i];  }  lines.clear();
                        
 #ifdef USE_MPI 
-                               int pid, end, numSeqsPerProcessor; 
+                               int pid, numSeqsPerProcessor; 
                                int tag = 2001;
                                vector<unsigned long int> MPIPos;
                                
@@ -559,16 +558,6 @@ int ClassifySeqsCommand::execute(){
                                
                                numFastaSeqs = createProcesses(newTaxonomyFile, tempTaxonomyFile, fastaFileNames[s]); 
                                
-                               rename((newTaxonomyFile + toString(processIDS[0]) + ".temp").c_str(), newTaxonomyFile.c_str());
-                               rename((tempTaxonomyFile + toString(processIDS[0]) + ".temp").c_str(), tempTaxonomyFile.c_str());
-                               
-                               for(int i=1;i<processors;i++){
-                                       appendTaxFiles((newTaxonomyFile + toString(processIDS[i]) + ".temp"), newTaxonomyFile);
-                                       appendTaxFiles((tempTaxonomyFile + toString(processIDS[i]) + ".temp"), tempTaxonomyFile);
-                                       remove((newTaxonomyFile + toString(processIDS[i]) + ".temp").c_str());
-                                       remove((tempTaxonomyFile + toString(processIDS[i]) + ".temp").c_str());
-                               }
-                               
                        }
        #else
                        numFastaSeqs = driver(lines[0], newTaxonomyFile, tempTaxonomyFile, fastaFileNames[s]);
@@ -662,7 +651,7 @@ int ClassifySeqsCommand::execute(){
                        
                        //get maxLevel from phylotree so you know how many 'unclassified's to add
                        int maxLevel = taxaSum.getMaxLevel();
-                       
+                                                       
                        //read taxfile - this reading and rewriting is done to preserve the confidence scores.
                        string name, taxon;
                        while (!inTax.eof()) {
@@ -736,7 +725,7 @@ string ClassifySeqsCommand::addUnclassifieds(string tax, int maxlevel) {
 int ClassifySeqsCommand::createProcesses(string taxFileName, string tempTaxFile, string filename) {
        try {
 #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
-               int process = 0;
+               int process = 1;
                int num = 0;
                
                //loop through and create all the processes you want
@@ -764,8 +753,11 @@ int ClassifySeqsCommand::createProcesses(string taxFileName, string tempTaxFile,
                        }
                }
                
+               //parent does its part
+               num = driver(lines[0], taxFileName, tempTaxFile, filename);
+               
                //force parent to wait until all the processes are done
-               for (int i=0;i<processors;i++) { 
+               for (int i=0;i<processIDS.size();i++) { 
                        int temp = processIDS[i];
                        wait(&temp);
                }
@@ -778,6 +770,13 @@ int ClassifySeqsCommand::createProcesses(string taxFileName, string tempTaxFile,
                        in.close(); remove(tempFile.c_str());
                }
                
+               for(int i=0;i<processIDS.size();i++){
+                       appendTaxFiles((taxFileName + toString(processIDS[i]) + ".temp"), taxFileName);
+                       appendTaxFiles((tempTaxFile + toString(processIDS[i]) + ".temp"), tempTaxFile);
+                       remove((taxFileName + toString(processIDS[i]) + ".temp").c_str());
+                       remove((tempTaxFile + toString(processIDS[i]) + ".temp").c_str());
+               }
+               
                return num;
 #endif         
        }
@@ -829,13 +828,14 @@ int ClassifySeqsCommand::driver(linePair* filePos, string taxFName, string tempT
 
                bool done = false;
                int count = 0;
-       
+               
                while (!done) {
                        if (m->control_pressed) { return 0; }
                
                        Sequence* candidateSeq = new Sequence(inFASTA); m->gobble(inFASTA);
-               
+                       
                        if (candidateSeq->getName() != "") {
+                       
                                taxonomy = classify->getTaxonomy(candidateSeq);
                                
                                if (m->control_pressed) { delete candidateSeq; return 0; }
@@ -863,10 +863,11 @@ int ClassifySeqsCommand::driver(linePair* filePos, string taxFName, string tempT
                        
                        //report progress
                        if((count) % 100 == 0){ m->mothurOut("Processing sequence: " + toString(count)); m->mothurOutEndLine();         }
+                       
                }
                //report progress
                if((count) % 100 != 0){ m->mothurOut("Processing sequence: " + toString(count)); m->mothurOutEndLine();         }
-                               
+                       
                inFASTA.close();
                outTax.close();
                outTaxSimple.close();