added sequence name to error string in fastq.info. Changed np_shannon to npshannon.

[mothur.git] / sharedrabundfloatvector.h

diff --git a/sharedrabundfloatvector.h b/sharedrabundfloatvector.h
index f826d9ce4b525e61909324c3481dd6a7bd847146..12df9e87eab30fb3cc31ae8c6c7d6d5d54e81d0f 100644 (file)
--- 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.
@@ -51,9 +51,11 @@ public:
        void push_back(float, string);  //abundance, groupname
        void pop_back();
        void resize(int);
+       void clear();
        int size();
        
        void print(ostream&);
+       void printHeaders(ostream&);
                
        RAbundVector getRAbundVector();
        SAbundVector getSAbundVector();
@@ -67,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*>&);
 };