made sorting optional but sort by default, in case the user wants to see the heatmap...

[mothur.git] / sharedordervector.h

diff --git a/sharedordervector.h b/sharedordervector.h
index b1b4a653dd51fb0280a5ea1189d690cf090614a4..a530ad65289a67a9c92cbeeb55c0ce661ef1ac8c 100644 (file)
--- a/sharedordervector.h
+++ b/sharedordervector.h
@@ -23,12 +23,17 @@ struct individual {
                string group;
                int bin;
                int abundance;
+               bool operator()(const individual& i1, const individual& i2) {
+               return (i1.abundance > i2.abundance);
+               }
 };
 
 #include "sabundvector.hpp"
 #include "rabundvector.hpp"
 #include "sharedrabundvector.h"
 #include "sharedsabundvector.h"
+#include "globaldata.hpp"
+#include "groupmap.h"
 
 class SharedOrderVector : public DataVector {
        
@@ -38,7 +43,7 @@ public:
        SharedOrderVector(const SharedOrderVector& ov)  : DataVector(ov.label), data(ov.data), maxRank(ov.maxRank), numBins(ov.numBins), numSeqs(ov.numSeqs), needToUpdate(ov.needToUpdate) {if(needToUpdate == 1){     updateStats();}};
 
        SharedOrderVector(string, vector<individual>);
-//     SharedOrderVector(ifstream&);
+       SharedOrderVector(ifstream&);
        ~SharedOrderVector(){};
        
        void set(int, int, int, string);        //index, OTU, abundance, group
@@ -63,6 +68,8 @@ public:
        SharedSAbundVector getSharedSAbundVector(string);       //get the sharedSabundvector for a sepecific group
        
 private:
+       GlobalData* globaldata;
+       GroupMap* groupmap;
        vector<individual>  data; 
        map< int, vector<individual> >::iterator it;
        int maxRank;