fixed bug in bootstrap command that was caused by globaldata's breakup, and made...

[mothur.git] / bootstrapsharedcommand.h

diff --git a/bootstrapsharedcommand.h b/bootstrapsharedcommand.h
index 4d2ebe39fc3a3283ca2aa6ac844d6e2f5865f9e2..ee393f9eb3fecd8cac0ddfbea3c5e69863b8a621 100644 (file)
--- a/bootstrapsharedcommand.h
+++ b/bootstrapsharedcommand.h
@@ -19,6 +19,7 @@
 #include "tree.h"
 #include "treemap.h"
 #include "sharedutilities.h"
+#include "concensuscommand.h"
        
 class GlobalData;
 
@@ -31,7 +32,7 @@ public:
        void help();
        
 private:
-       void createTree(ostream*);
+       void createTree(ostream*, Tree*);
        void printSims();
        void process(SharedOrderVector*);
        
@@ -41,6 +42,9 @@ private:
        ReadOTUFile* read;
        TreeMap* tmap;
        Tree* t;
+       Tree* tempTree;
+       ConcensusCommand* concensus;
+       vector< vector<Tree*> > trees;  //a vector of trees for each calculator chosen
        vector<Calculator*> treeCalculators;
        vector<ofstream*> out;
        vector< vector<float> > simMatrix;