added read.shared, broke up globaldata a bit

[mothur.git] / sharedordervector.h

diff --git a/sharedordervector.h b/sharedordervector.h
index b1b4a653dd51fb0280a5ea1189d690cf090614a4..94d91c5756da05a608253694a307ad6ea931baed 100644 (file)
--- a/sharedordervector.h
+++ b/sharedordervector.h
@@ -29,6 +29,8 @@ struct individual {
 #include "rabundvector.hpp"
 #include "sharedrabundvector.h"
 #include "sharedsabundvector.h"
+#include "globaldata.hpp"
+#include "groupmap.h"
 
 class SharedOrderVector : public DataVector {
        
@@ -38,7 +40,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 +65,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;