X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=collectcommand.h;h=7c5ec4278bf75e95043b28ea68eda32e54b17837;hb=a8f5a612bba54ceb74e17efc027d3a7f5aa93c9a;hp=9c24339d3d3745a1b2a6591af023c0fbb7ab3901;hpb=f18d75f9c996cb619a5051a7664620c0c5ae05fb;p=mothur.git diff --git a/collectcommand.h b/collectcommand.h index 9c24339..7c5ec42 100644 --- a/collectcommand.h +++ b/collectcommand.h @@ -12,10 +12,10 @@ #include "command.hpp" #include "ordervector.hpp" #include "inputdata.h" -//#include "groupmap.h" +#include "groupmap.h" #include "collect.h" #include "display.h" -#include "readmatrix.hpp" +#include "readotu.h" #include "validcalculator.h" /*The collect() command: @@ -43,13 +43,14 @@ public: private: GlobalData* globaldata; - ReadMatrix* read; + ReadOTUFile* read; OrderVector* order; + OrderVector* lastOrder; InputData* input; Collect* cCurve; ValidCalculators* validCalculator; vector cDisplays; - int freq, abund; + int freq, abund, size; };