changed heatmap and venn command to use vector of sharedrabunds instead of order...

[mothur.git] / sharedordervector.cpp

diff --git a/sharedordervector.cpp b/sharedordervector.cpp
index 41daa8024713190e997fcb845c144731252386ed..0a6f095a0345a9865553b2189585b85629bf4697 100644 (file)
--- a/sharedordervector.cpp
+++ b/sharedordervector.cpp
@@ -11,7 +11,7 @@ using namespace std;
 
 
 #include "sharedordervector.h"
-
+#include "sharedutilities.h"
 
 /***********************************************************************/
 
@@ -296,6 +296,28 @@ SharedRAbundVector SharedOrderVector::getSharedRAbundVector(string group) {
                exit(1);
        }
        
+}
+/***********************************************************************/
+vector<SharedRAbundVector*> SharedOrderVector::getSharedRAbundVector() {
+       try {
+               SharedUtil* util;
+               util = new SharedUtil();
+               vector<SharedRAbundVector*> lookup;
+               
+               util->setGroups(globaldata->Groups, globaldata->gGroupmap->namesOfGroups);
+               util->getSharedVectors(globaldata->Groups, lookup, this);
+               
+               return lookup;
+       }
+       catch(exception& e) {
+               cout << "Standard Error: " << e.what() << " has occurred in the SharedOrderVector class Function getSharedRAbundVector. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               exit(1);
+       }
+       catch(...) {
+               cout << "An unknown error has occurred in the SharedOrderVector class function getSharedRAbundVector. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               exit(1);
+       }
+       
 }
 /***********************************************************************/
 SharedSAbundVector SharedOrderVector::getSharedSAbundVector(string group) {