fixes while testing 1.33.0

[mothur.git] / sharedordervector.h

diff --git a/sharedordervector.h b/sharedordervector.h
index d0a714cf98c8d0406fc5ebba751d4fe63d40ac31..7d383ac84f431830e2324cd51d4777d80a3390e0 100644 (file)
--- a/sharedordervector.h
+++ b/sharedordervector.h
@@ -24,17 +24,25 @@ struct individual {
                bool operator()(const individual& i1, const individual& i2) {
                return (i1.abundance > i2.abundance);
                }
+       individual() {  group = ""; bin = 0; abundance = 0; }
 };
 
+struct individualFloat {
+               string group;
+               int bin;
+               float abundance;
+               bool operator()(const individual& i1, const individual& i2) {
+               return (i1.abundance > i2.abundance);
+               }
+       individualFloat() { group = ""; bin = 0; abundance = 0.0; }
+};
+
+
 #include "sabundvector.hpp"
 #include "rabundvector.hpp"
 #include "sharedrabundvector.h"
 #include "sharedsabundvector.h"
-#include "globaldata.hpp"
 #include "groupmap.h"
-//#include "globaldata.hpp"
-
-class GlobalData;
 
 class SharedOrderVector : public DataVector {
        
@@ -56,6 +64,7 @@ public:
        vector<individual>::iterator end();
        void push_back(int, int, string);  //OTU, abundance, group  MUST CALL UPDATE STATS AFTER PUSHBACK!!!
        void updateStats();
+       void clear();
 
        int getNumBins();
        int getNumSeqs();
@@ -70,7 +79,6 @@ public:
        vector<SharedRAbundVector*> getSharedRAbundVector(); //returns sharedRabundVectors for all the users groups
        
 private:
-       GlobalData* globaldata;
        GroupMap* groupmap;
        vector<individual>  data; 
        map< int, vector<individual> >::iterator it;