modified some calculators and other stuff - pds

[mothur.git] / venncommand.h

diff --git a/venncommand.h b/venncommand.h
index f8151c1bdf0e3a547638639dfbf2aa5ac9f437ed..663839c92ca560e8b5f657a775b634c83ef8af6d 100644 (file)
--- a/venncommand.h
+++ b/venncommand.h
@@ -11,9 +11,10 @@
  
 #include "command.hpp"
 #include "inputdata.h"
-#include "readmatrix.hpp"
+#include "readotu.h"
 #include "sharedlistvector.h"
 #include "venn.h"
+#include "validcalculator.h"
 
 
 class GlobalData;
@@ -28,15 +29,16 @@ public:
        
 private:
        GlobalData* globaldata;
-       ReadMatrix* read;
+       ReadOTUFile* read;
        InputData* input;
        SharedListVector* SharedList;
-       SharedOrderVector* order;
-       OrderVector* ordersingle;
        Venn* venn;
        string format;
-       
-       void setGroups();
+       vector<Calculator*> vennCalculators;    
+       ValidCalculators* validCalculator;
+       vector<SharedRAbundVector*> lookup;
+       SAbundVector* sabund;
+       int abund;
 
 };