fixes while testing 1.33.0

[mothur.git] / sharedsabundvector.h

diff --git a/sharedsabundvector.h b/sharedsabundvector.h
index 7010968f53ce641bd9f6396e4213ecb2dd5fb361..cd78a2e1a6722cc3015f90b7521d77ffbc6ae65b 100644 (file)
--- a/sharedsabundvector.h
+++ b/sharedsabundvector.h
@@ -7,19 +7,22 @@
  *  Dotur
  *
  *  Created by Sarah Westcott on 12/10/08.
- *  Copyright 2008 __MyCompanyName__. All rights reserved.
+ *  Copyright 2008 Schloss Lab UMASS Amherst. All rights reserved.
  *
  */
 
-
-#include <Carbon/Carbon.h>
 #include "datavector.hpp"
 #include "rabundvector.hpp"
 #include "ordervector.hpp"
 #include "sharedordervector.h"
 #include "sharedrabundvector.h"
 
-using namespace std;
+/* This class is a child to datavector.  It represents OTU information at a certain distance. 
+       It is similiar to an sabundvector except each member of data knows which group it belongs to.
+       Each member of the internal container "data" is a struct of type individual. 
+       An individual which knows the OTU from which it came, 
+       the group it is in and its abundance.  */
+
 
 class SharedSAbundVector : public DataVector {
        
@@ -35,21 +38,23 @@ public:
        string getGroup();
        void setGroup(string);  
        
-       void set(int, int, string);     
+       void set(int, int, string);      //OTU, abundance, group
        individual get(int);
        int getAbundance(int);
-       void push_back(int, int, string);
+       void push_back(int, int, string);       //abundance, OTU, group
        void pop_back();
        void resize(int);
        int size();
+       void clear();
 
        void print(ostream&);
                
        RAbundVector getRAbundVector(); 
        SAbundVector getSAbundVector();
-       SharedSAbundVector getSharedSAbundVector();
-       SharedRAbundVector getSharedVector();
        OrderVector getOrderVector(map<string,int>*);
+       SharedSAbundVector getSharedSAbundVector();
+       SharedRAbundVector getSharedRAbundVector();
+       SharedOrderVector getSharedOrderVector();
        
 private:
        vector<individual> data;