added warning about merging with something above cutoff to cluster. working on chimeras

[mothur.git] / bootstrapsharedcommand.h

diff --git a/bootstrapsharedcommand.h b/bootstrapsharedcommand.h
index 9ff44b377ab90472b8bb5867a9e5bb9a18208068..6b63233862a661634ab03f47951d683104b125c7 100644 (file)
--- a/bootstrapsharedcommand.h
+++ b/bootstrapsharedcommand.h
@@ -19,6 +19,7 @@
 #include "tree.h"
 #include "treemap.h"
 #include "sharedutilities.h"
+#include "consensuscommand.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* consensus;
+       vector< vector<Tree*> > trees;  //a vector of trees for each calculator chosen
        vector<Calculator*> treeCalculators;
        vector<ofstream*> out;
        vector< vector<float> > simMatrix;
@@ -49,13 +53,10 @@ private:
        ValidCalculators* validCalculator;
        SharedOrderVector* order;
        vector<SharedRAbundVector*> lookup;
-       OptionParser* parser;
-       map<string, string> parameters;
-       map<string, string>::iterator it;
+
        bool abort, allLines;
-       set<int> lines; //hold lines to be used
        set<string> labels; //holds labels to be used
-       string outputFile, calc, groups, line, label;
+       string outputFile, calc, groups, label, outputDir;
        int numGroups, iters;
        vector<string>  Estimators, Groups; //holds estimators to be used