fixed a bug in calculating the # of ambig bases

[mothur.git] / rarefactsharedcommand.cpp

diff --git a/rarefactsharedcommand.cpp b/rarefactsharedcommand.cpp
index 4a25cb3208f2695fc50308a8ff7df83deda163a8..c9300259f90726511200a077c9ef633ec7eaa76b 100644 (file)
--- a/rarefactsharedcommand.cpp
+++ b/rarefactsharedcommand.cpp
@@ -19,8 +19,9 @@ RareFactSharedCommand::RareFactSharedCommand(){
                string fileNameRoot;
                fileNameRoot = getRootName(globaldata->inputFileName);
                format = globaldata->getFormat();
+               convert(globaldata->getFreq(), freq);
+               convert(globaldata->getIters(), nIters);
                validCalculator = new ValidCalculators();
-               util = new SharedUtil();
                                
                int i;
                for (i=0; i<globaldata->Estimators.size(); i++) {
@@ -52,11 +53,9 @@ RareFactSharedCommand::RareFactSharedCommand(){
 //**********************************************************************************************************************
 
 RareFactSharedCommand::~RareFactSharedCommand(){
-       delete order;
        delete input;
        delete rCurve;
        delete read;
-       delete util;
 }
 
 //**********************************************************************************************************************
@@ -72,31 +71,77 @@ int RareFactSharedCommand::execute(){
                read->read(&*globaldata); 
                        
                input = globaldata->ginput;
-               order = input->getSharedOrderVector();
-                               
-               //set users groups
-               util->setGroups(globaldata->Groups, globaldata->gGroupmap->namesOfGroups, "rarefact");
+               lookup = input->getSharedRAbundVectors();
+               vector<SharedRAbundVector*> lastLookup = lookup;
                
-               while(order != NULL){
+               if (lookup.size() < 2) { 
+                       cout << "I cannot run the command without at least 2 valid groups."; 
+                       for (int i = 0; i < lookup.size(); i++) { delete lookup[i]; }
+                       return 0;
+               }
                
-                       if(globaldata->allLines == 1 || globaldata->lines.count(count) == 1 || globaldata->labels.count(order->getLabel()) == 1){
-                               //create collectors curve
-                               rCurve = new Rarefact(order, rDisplays);
-                               convert(globaldata->getFreq(), freq);
-                               convert(globaldata->getIters(), nIters);
-                               rCurve->getSharedCurve(freq, nIters);
+               //if the users enters label "0.06" and there is no "0.06" in their file use the next lowest label.
+               set<string> processedLabels;
+               set<string> userLabels = globaldata->labels;
+               set<int> userLines = globaldata->lines;
+       
+               //as long as you are not at the end of the file or done wih the lines you want
+               while((lookup[0] != NULL) && ((globaldata->allLines == 1) || (userLabels.size() != 0) || (userLines.size() != 0))) {
                        
+                       if(globaldata->allLines == 1 || globaldata->lines.count(count) == 1 || globaldata->labels.count(lookup[0]->getLabel()) == 1){
+                               
+                               rCurve = new Rarefact(lookup, rDisplays);
+                               rCurve->getSharedCurve(freq, nIters);
                                delete rCurve;
                        
-                               cout << order->getLabel() << '\t' << count << endl;
+                               cout << lookup[0]->getLabel() << '\t' << count << endl;
+                               processedLabels.insert(lookup[0]->getLabel());
+                               userLabels.erase(lookup[0]->getLabel());
+                               userLines.erase(count);
+                       }
+                       
+                       if ((anyLabelsToProcess(lookup[0]->getLabel(), userLabels, "") == true) && (processedLabels.count(lastLookup[0]->getLabel()) != 1)) {
+                                       cout << lastLookup[0]->getLabel() << '\t' << count << endl;
+                                       rCurve = new Rarefact(lastLookup, rDisplays);
+                                       rCurve->getSharedCurve(freq, nIters);
+                                       delete rCurve;
+
+                                       processedLabels.insert(lastLookup[0]->getLabel());
+                                       userLabels.erase(lastLookup[0]->getLabel());
                        }
+                               
+                       //prevent memory leak
+                       if (count != 1) { for (int i = 0; i < lastLookup.size(); i++) {  delete lastLookup[i];  } }
+                       lastLookup = lookup;
                        
                        //get next line to process
-                       delete order;
-                       order = input->getSharedOrderVector();
+                       lookup = input->getSharedRAbundVectors();
                        count++;
                }
-       
+               
+               //output error messages about any remaining user labels
+               set<string>::iterator it;
+               bool needToRun = false;
+               for (it = userLabels.begin(); it != userLabels.end(); it++) {  
+                       cout << "Your file does not include the label "<< *it; 
+                       if (processedLabels.count(lastLookup[0]->getLabel()) != 1) {
+                               cout << ". I will use " << lastLookup[0]->getLabel() << "." << endl;
+                               needToRun = true;
+                       }else {
+                               cout << ". Please refer to " << lastLookup[0]->getLabel() << "." << endl;
+                       }
+               }
+               
+               //run last line if you need to
+               if (needToRun == true)  {
+                       cout << lastLookup[0]->getLabel() << '\t' << count << endl;
+                       rCurve = new Rarefact(lastLookup, rDisplays);
+                       rCurve->getSharedCurve(freq, nIters);
+                       delete rCurve;
+               }
+               
+               for (int i = 0; i < lastLookup.size(); i++) {  delete lastLookup[i];  }
+
                for(int i=0;i<rDisplays.size();i++){    delete rDisplays[i];    }       
                
                //reset groups parameter