changed how we do "smart" distancing

[mothur.git] / collectcommand.h

diff --git a/collectcommand.h b/collectcommand.h
index 93b56073dee7955dc60d410347da82b4bf6d2dc2..b099c8a44390ef361019de2e12dff6af71f1dc73 100644 (file)
--- a/collectcommand.h
+++ b/collectcommand.h
@@ -15,7 +15,7 @@
 #include "groupmap.h"
 #include "collect.h"
 #include "display.h"
-#include "readmatrix.hpp"
+#include "readotu.h"
 #include "validcalculator.h"
 
 /*The collect() command:
@@ -37,19 +37,27 @@ class GlobalData;
 class CollectCommand : public Command {
        
 public:
-       CollectCommand();       
+       CollectCommand(string); 
        ~CollectCommand();
        int execute();  
+       void help();
        
 private:
        GlobalData* globaldata;
-       ReadMatrix* read;
+       ReadOTUFile* read;
        OrderVector* order;
        InputData* input;
        Collect* cCurve;
        ValidCalculators* validCalculator;
        vector<Display*> cDisplays;
-       int freq, abund;
+       int freq, abund, size;
+
+       bool abort, allLines;
+       set<int> lines; //hold lines to be used
+       set<string> labels; //holds labels to be used
+       string line, label, calc;
+       vector<string>  Estimators;
+
 
 };