bug fixes

[mothur.git] / sharedordervector.h

diff --git a/sharedordervector.h b/sharedordervector.h
index 30d655f7347c07fcb9a887ac5330959702e09382..6aa8ba1c1ed0dc6ef49f1aa5d8becac971852126 100644 (file)
--- a/sharedordervector.h
+++ b/sharedordervector.h
@@ -15,8 +15,6 @@
        the group it is in and the abundance is equal to the OTU number.  */
 
 
-using namespace std;
-
 #include "datavector.hpp"
 
 struct individual {
@@ -26,8 +24,20 @@ struct individual {
                bool operator()(const individual& i1, const individual& i2) {
                return (i1.abundance > i2.abundance);
                }
+       individual() { group = ""; bin = 0; abundance = 0; }
 };
 
+struct individualFloat {
+               string group;
+               int bin;
+               float abundance;
+               bool operator()(const individual& i1, const individual& i2) {
+               return (i1.abundance > i2.abundance);
+               }
+       individualFloat() { group = ""; bin = 0; abundance = 0.0; }
+};
+
+
 #include "sabundvector.hpp"
 #include "rabundvector.hpp"
 #include "sharedrabundvector.h"
@@ -58,6 +68,7 @@ public:
        vector<individual>::iterator end();
        void push_back(int, int, string);  //OTU, abundance, group  MUST CALL UPDATE STATS AFTER PUSHBACK!!!
        void updateStats();
+       void clear();
 
        int getNumBins();
        int getNumSeqs();