]> git.donarmstrong.com Git - mothur.git/blobdiff - collectcommand.cpp
another attempt to fix sffinfo
[mothur.git] / collectcommand.cpp
index 9bf2c9a88c49f49f27d8a641aabc4d9f8d2ab3fe..8c1565b901d5b885ad86b91d31cb7cc041138535 100644 (file)
@@ -110,6 +110,7 @@ void CollectCommand::help(){
                m->mothurOut("The collect.single command can be executed after a successful cluster command.  It will use the .list file from the output of the cluster.\n");
                m->mothurOut("The collect.single command parameters are label, freq, calc and abund.  No parameters are required. \n");
                m->mothurOut("The collect.single command should be in the following format: \n");
+               m->mothurOut("The freq parameter is used indicate when to output your data, by default it is set to 100. But you can set it to a percentage of the number of sequence. For example freq=0.10, means 10%. \n");
                m->mothurOut("collect.single(label=yourLabel, iters=yourIters, freq=yourFreq, calc=yourEstimators).\n");
                m->mothurOut("Example collect(label=unique-.01-.03, iters=10000, freq=10, calc=sobs-chao-ace-jack).\n");
                m->mothurOut("The default values for freq is 100, and calc are sobs-chao-ace-jack-shannon-npshannon-simpson.\n");
@@ -136,12 +137,13 @@ int CollectCommand::execute(){
                
                vector<string> outputNames;
                
+               string hadShared = "";
                if ((globaldata->getFormat() != "sharedfile")) { inputFileNames.push_back(globaldata->inputFileName);  }
-               else {  inputFileNames = parseSharedFile(globaldata->getSharedFile());  globaldata->setFormat("rabund");  }
+               else { hadShared = globaldata->getSharedFile(); inputFileNames = parseSharedFile(globaldata->getSharedFile());  globaldata->setFormat("rabund");  }
        
                for (int p = 0; p < inputFileNames.size(); p++) {
                        
-                       if (m->control_pressed) {  for (int i = 0; i < outputNames.size(); i++) {       remove(outputNames[i].c_str());         }  globaldata->Groups.clear(); return 0; }
+                       if (m->control_pressed) {  for (int i = 0; i < outputNames.size(); i++) {       remove(outputNames[i].c_str());         }  globaldata->Groups.clear(); if (hadShared != "") {  globaldata->setSharedFile(hadShared); globaldata->setFormat("sharedfile");  } return 0; }
                        
                        if (outputDir == "") { outputDir += hasPath(inputFileNames[p]); }
                        string fileNameRoot = outputDir + getRootName(getSimpleName(inputFileNames[p]));
@@ -220,7 +222,7 @@ int CollectCommand::execute(){
                        }
                
                        //if the users entered no valid calculators don't execute command
-                       if (cDisplays.size() == 0) { return 0; }
+                       if (cDisplays.size() == 0) { if (hadShared != "") {  globaldata->setSharedFile(hadShared); globaldata->setFormat("sharedfile");  } return 0; }
                        
                        read = new ReadOTUFile(inputFileNames[p]);      
                        read->read(&*globaldata); 
@@ -234,37 +236,40 @@ int CollectCommand::execute(){
                        set<string> userLabels = labels;
                        
                        if (m->control_pressed) {  
-                               for (int i = 0; i < outputNames.size(); i++) {  remove(outputNames[i].c_str());         }  
                                for(int i=0;i<cDisplays.size();i++){    delete cDisplays[i];    }
+                               for (int i = 0; i < outputNames.size(); i++) {  remove(outputNames[i].c_str());         }
                                delete input;  globaldata->ginput = NULL;
                                delete read;
                                delete order; globaldata->gorder = NULL;
                                delete validCalculator;
                                globaldata->Groups.clear();
+                               if (hadShared != "") {  globaldata->setSharedFile(hadShared); globaldata->setFormat("sharedfile");  }
                                return 0;
                        }
 
 
                        while((order != NULL) && ((allLines == 1) || (userLabels.size() != 0))) {
+                       
+                               if (m->control_pressed) { 
+                                       for(int i=0;i<cDisplays.size();i++){    delete cDisplays[i];    }
+                                       for (int i = 0; i < outputNames.size(); i++) {  remove(outputNames[i].c_str());         }
+                                       delete input;  globaldata->ginput = NULL;
+                                       delete read;
+                                       delete order; globaldata->gorder = NULL;
+                                       delete validCalculator;
+                                       globaldata->Groups.clear();
+                                       if (hadShared != "") {  globaldata->setSharedFile(hadShared); globaldata->setFormat("sharedfile");  }
+                                       return 0;
+                               }
+
                                
                                if(allLines == 1 || labels.count(order->getLabel()) == 1){
-                                       
+                               
+                                       m->mothurOut(order->getLabel()); m->mothurOutEndLine();
                                        cCurve = new Collect(order, cDisplays);
-                                       int error = cCurve->getCurve(freq);
+                                       cCurve->getCurve(freq);
                                        delete cCurve;
                                        
-                                       if (error == 1) {
-                                               for (int i = 0; i < outputNames.size(); i++) {  remove(outputNames[i].c_str());         }  
-                                               for(int i=0;i<cDisplays.size();i++){    delete cDisplays[i];    }
-                                               delete input;  globaldata->ginput = NULL;
-                                               delete read;
-                                               delete order; globaldata->gorder = NULL;
-                                               delete validCalculator;
-                                               globaldata->Groups.clear();
-                                               return 0;
-                                       }
-                                       
-                                       m->mothurOut(order->getLabel()); m->mothurOutEndLine();
                                        processedLabels.insert(order->getLabel());
                                        userLabels.erase(order->getLabel());
                                        
@@ -277,22 +282,12 @@ int CollectCommand::execute(){
                                        delete order;
                                        order = (input->getOrderVector(lastLabel));
                                        
+                                       m->mothurOut(order->getLabel()); m->mothurOutEndLine();
                                        cCurve = new Collect(order, cDisplays);
-                                       int error = cCurve->getCurve(freq);
+                                       cCurve->getCurve(freq);
                                        delete cCurve;
                                        
-                                       if (error == 1) {
-                                               for (int i = 0; i < outputNames.size(); i++) {  remove(outputNames[i].c_str());         }  
-                                               for(int i=0;i<cDisplays.size();i++){    delete cDisplays[i];    }
-                                               delete input;  globaldata->ginput = NULL;
-                                               delete read;
-                                               delete order; globaldata->gorder = NULL;
-                                               delete validCalculator;
-                                               globaldata->Groups.clear();
-                                               return 0;
-                                       }
                                        
-                                       m->mothurOut(order->getLabel()); m->mothurOutEndLine();
                                        processedLabels.insert(order->getLabel());
                                        userLabels.erase(order->getLabel());
                                        
@@ -306,6 +301,18 @@ int CollectCommand::execute(){
                                order = (input->getOrderVector());
                        }
                        
+                       
+                       if (m->control_pressed) { 
+                                       for(int i=0;i<cDisplays.size();i++){    delete cDisplays[i];    }
+                                       for (int i = 0; i < outputNames.size(); i++) {  remove(outputNames[i].c_str());         }
+                                       delete input;  globaldata->ginput = NULL;
+                                       delete read;
+                                       delete validCalculator;
+                                       globaldata->Groups.clear();
+                                       if (hadShared != "") {  globaldata->setSharedFile(hadShared); globaldata->setFormat("sharedfile");  }
+                                       return 0;
+                       }
+                               
                        //output error messages about any remaining user labels
                        set<string>::iterator it;
                        bool needToRun = false;
@@ -327,17 +334,18 @@ int CollectCommand::execute(){
                                m->mothurOut(order->getLabel()); m->mothurOutEndLine();
                                
                                cCurve = new Collect(order, cDisplays);
-                               int error = cCurve->getCurve(freq);
+                               cCurve->getCurve(freq);
                                delete cCurve;
                                
-                               if (error == 1) {
-                                       for (int i = 0; i < outputNames.size(); i++) {  remove(outputNames[i].c_str());         }  
+                               if (m->control_pressed) { 
                                        for(int i=0;i<cDisplays.size();i++){    delete cDisplays[i];    }
+                                       for (int i = 0; i < outputNames.size(); i++) {  remove(outputNames[i].c_str());         }
                                        delete input;  globaldata->ginput = NULL;
                                        delete read;
                                        delete order; globaldata->gorder = NULL;
                                        delete validCalculator;
                                        globaldata->Groups.clear();
+                                       if (hadShared != "") {  globaldata->setSharedFile(hadShared); globaldata->setFormat("sharedfile");  }
                                        return 0;
                                }
                                delete order;
@@ -351,6 +359,11 @@ int CollectCommand::execute(){
                        delete validCalculator;
                }
                
+               //return to shared mode if you changed above
+               if (hadShared != "") {  globaldata->setSharedFile(hadShared); globaldata->setFormat("sharedfile");  }
+
+               if (m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) {        remove(outputNames[i].c_str());         } return 0; }
+                               
                m->mothurOutEndLine();
                m->mothurOut("Output File Names: "); m->mothurOutEndLine();
                for (int i = 0; i < outputNames.size(); i++) {  m->mothurOut(outputNames[i]); m->mothurOutEndLine();    }