added MPI to dist.seqs command

[mothur.git] / bootstrapsharedcommand.h

diff --git a/bootstrapsharedcommand.h b/bootstrapsharedcommand.h
index ee393f9eb3fecd8cac0ddfbea3c5e69863b8a621..be4a7648825ba541a253daa74817b120ed087f57 100644 (file)
--- a/bootstrapsharedcommand.h
+++ b/bootstrapsharedcommand.h
@@ -19,7 +19,7 @@
 #include "tree.h"
 #include "treemap.h"
 #include "sharedutilities.h"
-#include "concensuscommand.h"
+#include "consensuscommand.h"
        
 class GlobalData;
 
@@ -32,9 +32,9 @@ public:
        void help();
        
 private:
-       void createTree(ostream*, Tree*);
+       int createTree(ostream*, Tree*);
        void printSims();
-       void process(SharedOrderVector*);
+       int process(SharedOrderVector*);
        
        
        GlobalData* globaldata;
@@ -43,7 +43,7 @@ private:
        TreeMap* tmap;
        Tree* t;
        Tree* tempTree;
-       ConcensusCommand* concensus;
+       ConcensusCommand* consensus;
        vector< vector<Tree*> > trees;  //a vector of trees for each calculator chosen
        vector<Calculator*> treeCalculators;
        vector<ofstream*> out;
@@ -55,11 +55,10 @@ private:
        vector<SharedRAbundVector*> lookup;
 
        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
+       vector<string>  Estimators, Groups, outputNames; //holds estimators to be used
 
 };