]> git.donarmstrong.com Git - mothur.git/blobdiff - venncommand.cpp
changed all shared commands so that they read the shared file generated by the read...
[mothur.git] / venncommand.cpp
index 56284811af853a6504cac1adf026d6b6e67f3214..b2dfc89bc6ad09c283e31b15523c8a868ad01711 100644 (file)
@@ -11,7 +11,7 @@
 #include "ace.h"
 #include "sobs.h"
 #include "chao1.h"
-#include "jackknife.h"
+//#include "jackknife.h"
 #include "sharedsobscollectsummary.h"
 #include "sharedchao1.h"
 #include "sharedace.h"
@@ -39,8 +39,8 @@ VennCommand::VennCommand(){
                                                if(abund < 5)
                                                        abund = 10;
                                                vennCalculators.push_back(new Ace(abund));
-                                       }else if (globaldata->Estimators[i] == "jack") {        
-                                               vennCalculators.push_back(new Jackknife());
+                                       //}else if (globaldata->Estimators[i] == "jack") {      
+                                               //vennCalculators.push_back(new Jackknife());
                                        }
                                }
                        }
@@ -93,75 +93,62 @@ int VennCommand::execute(){
                
                if (format == "sharedfile") {
                        //you have groups
-                       read = new ReadPhilFile(globaldata->inputFileName);     
+                       read = new ReadOTUFile(globaldata->inputFileName);      
                        read->read(&*globaldata); 
                        
                        input = globaldata->ginput;
-                       order = input->getSharedOrderVector();
-               }else if (format == "shared") {
-                       //you are using a list and a groupfile
-                       read = new ReadPhilFile(globaldata->inputFileName);     
-                       read->read(&*globaldata); 
-               
-                       input = globaldata->ginput;
-                       SharedList = globaldata->gSharedList;
-                       order = SharedList->getSharedOrderVector();
+                       lookup = input->getSharedRAbundVectors();
                }else if (format == "list") {
                        //you are using just a list file and have only one group
-                       read = new ReadPhilFile(globaldata->inputFileName);     
+                       read = new ReadOTUFile(globaldata->inputFileName);      
                        read->read(&*globaldata); 
                
-                       ordersingle = globaldata->gorder;
+                       sabund = globaldata->sabund;
                        input = globaldata->ginput;
                }
 
                
                if (format != "list") { 
                        
-                       setGroups();
-                       
-                       while(order != NULL){
+                       while(lookup[0] != NULL){
                
-                               if(globaldata->allLines == 1 || globaldata->lines.count(count) == 1 || globaldata->labels.count(order->getLabel()) == 1){                       
+                               if(globaldata->allLines == 1 || globaldata->lines.count(count) == 1 || globaldata->labels.count(lookup[0]->getLabel()) == 1){                   
        
-                                       cout << order->getLabel() << '\t' << count << endl;
-                                       venn->getPic(order, vennCalculators);
-
+                                       cout << lookup[0]->getLabel() << '\t' << count << endl;
+                                       
+                                       if (lookup.size() > 4) {
+                                               cout << "Error: Too many groups chosen.  You may use up to 4 groups with the venn command.  I will use the first four groups in your groupfile." << endl;
+                                               for (int i = lookup.size(); i > 3; i--) { delete lookup[i]; lookup.pop_back(); }
+                                       }
+                                       
+                                       //util->getSharedVectors(globaldata->Groups, lookup, order);  //fills group vectors from order vector.
+                                       venn->getPic(lookup, vennCalculators);
                                }
                                                
                                //get next line to process
-                               if (format == "sharedfile") {
-                                       order = input->getSharedOrderVector();
-                               }else {
-                                       //you are using a list and a groupfile
-                                       SharedList = input->getSharedListVector(); //get new list vector to process
-                                       if (SharedList != NULL) {
-                                               order = SharedList->getSharedOrderVector(); //gets new order vector with group info.
-                                       }else {
-                                               break;
-                                       }
-                               }
+                               lookup = input->getSharedRAbundVectors();
                                count++;
                        }
                        
                        //reset groups parameter
-                       globaldata->Groups.clear();  globaldata->setGroups("");
+                       globaldata->Groups.clear();  
                        
                }else{
-                       while(ordersingle != NULL){
                
-                               if(globaldata->allLines == 1 || globaldata->lines.count(count) == 1 || globaldata->labels.count(ordersingle->getLabel()) == 1){                 
+                       while(sabund != NULL){
+               
+                               if(globaldata->allLines == 1 || globaldata->lines.count(count) == 1 || globaldata->labels.count(sabund->getLabel()) == 1){                      
        
-                                       cout << ordersingle->getLabel() << '\t' << count << endl;
-                                       venn->getPic(ordersingle, vennCalculators);
-                                       
+                                       cout << sabund->getLabel() << '\t' << count << endl;
+                                       venn->getPic(sabund, vennCalculators);
                                }
                                
-                               ordersingle = (input->getOrderVector());
+                               sabund = input->getSAbundVector();
                                count++;
                        }
                }
                
+               globaldata->setGroups("");
                return 0;
        }
        catch(exception& e) {
@@ -174,68 +161,4 @@ int VennCommand::execute(){
        }               
 }
 
-//**********************************************************************************************************************
-void VennCommand::setGroups() {
-       try {
-               //if the user has not entered specific groups to analyze then do them all
-               if (globaldata->Groups.size() != 0) {
-                       if (globaldata->Groups[0] != "all") {
-                               //check that groups are valid
-                               for (int i = 0; i < globaldata->Groups.size(); i++) {
-                                       if (globaldata->gGroupmap->isValidGroup(globaldata->Groups[i]) != true) {
-                                               cout << globaldata->Groups[i] << " is not a valid group, and will be disregarded." << endl;
-                                               // erase the invalid group from globaldata->Groups
-                                               globaldata->Groups.erase(globaldata->Groups.begin()+i);
-                                       }
-                               }
-                       
-                               //if the user only entered invalid groups
-                               if (globaldata->Groups.size() == 0) { 
-                                       if (globaldata->gGroupmap->namesOfGroups.size() > 4) {
-                                               cout << "When using the groups parameter you must have at least 1 valid group. I will run the command using the first four groups in your groupfile." << endl; 
-                                               for (int i = 0; i < 4; i++) {
-                                                       globaldata->Groups.push_back(globaldata->gGroupmap->namesOfGroups[i]);
-                                               }
-                                       }else {
-                                               cout << "When using the groups parameter you must have at least 1 valid group. I will run the command using all the groups in your groupfile." << endl; 
-                                               for (int i = 0; i < globaldata->gGroupmap->namesOfGroups.size(); i++) {
-                                                       globaldata->Groups.push_back(globaldata->gGroupmap->namesOfGroups[i]);
-                                               }
-                                       }
-
-                               }
-                       }else{//user has enter "all" and wants the default groups
-                               globaldata->Groups.clear();
-                               for (int i = 0; i < globaldata->gGroupmap->namesOfGroups.size(); i++) {
-                                       globaldata->Groups.push_back(globaldata->gGroupmap->namesOfGroups[i]);
-                               }
-                               globaldata->setGroups("");
-                       }
-               }else {
-                       for (int i = 0; i < globaldata->gGroupmap->namesOfGroups.size(); i++) {
-                               globaldata->Groups.push_back(globaldata->gGroupmap->namesOfGroups[i]);
-                       }
-               }
-               
-               
-               //check to make sure their are only 3 groups
-               if (globaldata->Groups.size() > 4) {
-                       cout << "You may only use up to 4 groups at a time with this command.  I will choose the first four and disregard the rest." << endl;
-                       for (int i = 4; i < globaldata->Groups.size(); i++) {
-                               globaldata->Groups.erase(globaldata->Groups.begin()+i);
-                       }
-               }
-               
-       }
-       catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the VennCommand class Function setGroups. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }
-       catch(...) {
-               cout << "An unknown error has occurred in the VennCommand class function setGroups. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }               
-
-}
-/***********************************************************/
-
+//**********************************************************************************************************************
\ No newline at end of file