X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=sharedordervector.h;h=7d383ac84f431830e2324cd51d4777d80a3390e0;hp=6aa8ba1c1ed0dc6ef49f1aa5d8becac971852126;hb=cf9987b67aa49777a4c91c2d21f96e58bf17aa82;hpb=89f19f9c6ab89c2f6c7c6921a328ae87bce6f8e3 diff --git a/sharedordervector.h b/sharedordervector.h index 6aa8ba1..7d383ac 100644 --- a/sharedordervector.h +++ b/sharedordervector.h @@ -24,7 +24,7 @@ struct individual { bool operator()(const individual& i1, const individual& i2) { return (i1.abundance > i2.abundance); } - individual() { group = ""; bin = 0; abundance = 0; } + individual() { group = ""; bin = 0; abundance = 0; } }; struct individualFloat { @@ -42,11 +42,7 @@ struct individualFloat { #include "rabundvector.hpp" #include "sharedrabundvector.h" #include "sharedsabundvector.h" -#include "globaldata.hpp" #include "groupmap.h" -//#include "globaldata.hpp" - -class GlobalData; class SharedOrderVector : public DataVector { @@ -83,7 +79,6 @@ public: vector getSharedRAbundVector(); //returns sharedRabundVectors for all the users groups private: - GlobalData* globaldata; GroupMap* groupmap; vector data; map< int, vector >::iterator it;