X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=sharedrabundvector.h;h=ab0c26ad807928a13fbf7c7a6c256c82a7efa719;hb=69180c6a4fd3c9ad48974b402d398efe61a58fa7;hp=b69bc30657a1667665709df1d21653c05d574b3a;hpb=fd282e6b4be2560f5b1bd154a9e8d24b798eefaf;p=mothur.git

diff --git a/sharedrabundvector.h b/sharedrabundvector.h
index b69bc30..ab0c26a 100644
--- a/sharedrabundvector.h
+++ b/sharedrabundvector.h
@@ -10,7 +10,6 @@
  *
  */
 
-#include <Carbon/Carbon.h>
 #include "datavector.hpp"
 #include "sharedordervector.h"
 #include "sharedsabundvector.h"
@@ -31,19 +30,26 @@ public:
 	SharedRAbundVector(int);
 	//SharedRAbundVector(string, vector<int>);
 	SharedRAbundVector(const SharedRAbundVector& bv) : DataVector(bv), data(bv.data), maxRank(bv.maxRank), numBins(bv.numBins), numSeqs(bv.numSeqs){};
-//	SharedRAbundVector(ifstream&);
+    //SharedRAbundVector(ifstream&);
 	~SharedRAbundVector();
 
 	int getNumBins();		
 	int getNumSeqs();							
 	int getMaxRank();
 	string getGroup();
-	void setGroup(string);							
+	void setGroup(string);
+	int getGroupIndex();
+	void setGroupIndex(int);								
 
 	void set(int, int, string);			//OTU, abundance, groupname
+	void setData(vector <individual>);
 	individual get(int);
+	vector <individual> getData();
 	int getAbundance(int);
-	void push_back(int, int, string);  //abundance, OTU, groupname
+	int numNZ();
+	void sortD();  //Sorts the data in descending order.
+	void push_front(int, int, string); //abundance, otu, groupname
+	void push_back(int, int, string);  //abundance, otu, groupname
 	void pop_back();
 	void resize(int);
 	int size();
@@ -53,6 +59,7 @@ public:
 	void print(ostream&);
 		
 	RAbundVector getRAbundVector();
+	RAbundVector getRAbundVector2();
 	SAbundVector getSAbundVector();
 	OrderVector getOrderVector(map<string,int>*);
 	SharedOrderVector getSharedOrderVector();
@@ -64,7 +71,8 @@ private:
 	int maxRank;
 	int numBins;
 	int numSeqs;
-	string group;	
+	string group;
+	int index;	
 };