X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=sharedrabundfloatvector.h;h=f8d69a8a5a17d4b9cadcf0e5c500d93498f601fc;hp=a3407f48ec39aabed942dff22b91d4691c992539;hb=615301e57c25e241356a9c2380648d117709458d;hpb=89f19f9c6ab89c2f6c7c6921a328ae87bce6f8e3

diff --git a/sharedrabundfloatvector.h b/sharedrabundfloatvector.h
index a3407f4..f8d69a8 100644
--- a/sharedrabundfloatvector.h
+++ b/sharedrabundfloatvector.h
@@ -15,7 +15,7 @@
 #include "sharedordervector.h"
 #include "sharedsabundvector.h"
 #include "rabundvector.hpp"
-#include "groupmap.h"
+//#include "groupmap.h"
 
 /* This class is a child to datavector.  It represents OTU information at a certain distance. 
 	It is similiar to an rabundvector except each member of data knows which group it belongs to.
@@ -23,7 +23,6 @@
 	An individual which knows the OTU from which it came, 
 	the group it is in and its abundance.  */
 
-class GlobalData;
 
 class SharedRAbundFloatVector : public DataVector {
 	
@@ -46,6 +45,7 @@ public:
 	individualFloat get(int);
 	vector <individual> getData();
 	float getAbundance(int);
+    vector<float> getAbundances();
 	void push_front(float, int, string); //abundance, otu, groupname
 	void insert(float, int, string); //abundance, otu, groupname
 	void push_back(float, string);  //abundance, groupname
@@ -55,6 +55,7 @@ public:
 	int size();
 	
 	void print(ostream&);
+	void printHeaders(ostream&);
 		
 	RAbundVector getRAbundVector();
 	SAbundVector getSAbundVector();
@@ -68,13 +69,15 @@ public:
 private:
 	vector<individualFloat>  data; 
 	vector<SharedRAbundFloatVector*> lookup;
-	GlobalData* globaldata;
-	GroupMap* groupmap;
+	//GlobalData* globaldata;
+	//GroupMap* groupmap;
 	float maxRank;
 	int numBins;
 	float numSeqs;
 	string group;
 	int index;	
+	
+	int eliminateZeroOTUS(vector<SharedRAbundFloatVector*>&);
 };