modified some calculators and other stuff - pds

[mothur.git] / sharedordervector.h

diff --git a/sharedordervector.h b/sharedordervector.h
index 94d91c5756da05a608253694a307ad6ea931baed..e941c7e5f860b770c5a766027d3cc658c94e3259 100644 (file)
--- a/sharedordervector.h
+++ b/sharedordervector.h
@@ -2,7 +2,7 @@
 #define SHAREDORDER_H
 /*
  *  sharedorder.h
- *  Dotur
+ *  Mothur
  *
  *  Created by Sarah Westcott on 12/9/08.
  *  Copyright 2008 Schloss Lab UMASS Amherst. All rights reserved.
@@ -23,6 +23,9 @@ struct individual {
                string group;
                int bin;
                int abundance;
+               bool operator()(const individual& i1, const individual& i2) {
+               return (i1.abundance > i2.abundance);
+               }
 };
 
 #include "sabundvector.hpp"
@@ -31,6 +34,9 @@ struct individual {
 #include "sharedsabundvector.h"
 #include "globaldata.hpp"
 #include "groupmap.h"
+//#include "globaldata.hpp"
+
+class GlobalData;
 
 class SharedOrderVector : public DataVector {
        
@@ -63,6 +69,7 @@ public:
        SharedOrderVector getSharedOrderVector();
        SharedRAbundVector getSharedRAbundVector(string);  //get the sharedRabundvector for a sepecific group
        SharedSAbundVector getSharedSAbundVector(string);       //get the sharedSabundvector for a sepecific group
+       vector<SharedRAbundVector*> getSharedRAbundVector(); //returns sharedRabundVectors for all the users groups
        
 private:
        GlobalData* globaldata;