X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=sabundvector.hpp;h=769a35dd3a14c85a160ac81532b4d7aa3cd1914a;hb=058715887611e00dc18324cb0bd4a4a8472530b3;hp=3c68462a425b5f1710f679c4272c4b5e6e6c7877;hpb=fd282e6b4be2560f5b1bd154a9e8d24b798eefaf;p=mothur.git diff --git a/sabundvector.hpp b/sabundvector.hpp index 3c68462..769a35d 100644 --- a/sabundvector.hpp +++ b/sabundvector.hpp @@ -1,11 +1,10 @@ #ifndef SABUND_H #define SABUND_H -using namespace std; - #include "datavector.hpp" #include "rabundvector.hpp" #include "ordervector.hpp" +#include "calculator.h" /* This class is a child to datavector. It represents OTU information at a certain distance. @@ -24,6 +23,7 @@ public: SAbundVector(); SAbundVector(int); // SAbundVector(const SAbundVector&); + SAbundVector(vector, int, int, int); SAbundVector(string, vector); SAbundVector(const SAbundVector& rv) : DataVector(rv.label), data(rv.data), maxRank(rv.maxRank), numBins(rv.numBins), numSeqs(rv.numSeqs){}; SAbundVector(ifstream&); @@ -36,13 +36,15 @@ public: void set(int, int); int get(int); void push_back(int); + void quicksort(); + int sum(); void resize(int); int size(); void print(ostream&); void print(string, ostream&); - RAbundVector getRAbundVector(); + RAbundVector getRAbundVector(); SAbundVector getSAbundVector(); OrderVector getOrderVector(map*); @@ -50,6 +52,7 @@ private: vector data; // bool needToUpdate; // void updateStats(); + int maxRank; int numBins; int numSeqs;