version working on mac with .tellg changed to unget for windows

[mothur.git] / venncommand.h

diff --git a/venncommand.h b/venncommand.h
index 063b8afdfbf4f733c6e537b6c245dc6f17aca516..0b891437a51e99ea7c17ae18b5be63be51b6ed20 100644 (file)
--- a/venncommand.h
+++ b/venncommand.h
@@ -15,7 +15,6 @@
 #include "sharedlistvector.h"
 #include "venn.h"
 #include "validcalculator.h"
-#include "sharedutilities.h"
 
 
 class GlobalData;
@@ -24,23 +23,29 @@ class GlobalData;
 class VennCommand : public Command {
 
 public:
-       VennCommand();
+       VennCommand(string);
        ~VennCommand();
        int execute();
+       void help();
        
 private:
        GlobalData* globaldata;
        ReadOTUFile* read;
-       SharedUtil* util;
        InputData* input;
        SharedListVector* SharedList;
-       SharedOrderVector* order;
-       OrderVector* ordersingle;
        Venn* venn;
-       string format;
        vector<Calculator*> vennCalculators;    
        ValidCalculators* validCalculator;
+       vector<SharedRAbundVector*> lookup;
+       SAbundVector* sabund;
        int abund;
+       
+       bool abort, allLines;
+       set<int> lines; //hold lines to be used
+       set<string> labels; //holds labels to be used
+       string format, groups, calc, line, label;
+       vector<string> Estimators, Groups;
+
 
 };