fixed bug in read.tree updates help and validparameters strings, added ability for...

[mothur.git] / summarysharedcommand.h

diff --git a/summarysharedcommand.h b/summarysharedcommand.h
index 9ce3b69b65fab19c845b9344f9fe192d70e88ae0..248c1c8ecb81f2bbc069b25151c3908e05330907 100644 (file)
--- a/summarysharedcommand.h
+++ b/summarysharedcommand.h
@@ -9,15 +9,14 @@
  *
  */
 
-#include <iostream>
-#include <fstream>
-#include <vector>
+
 #include "command.hpp"
 #include "sharedrabundvector.h"
 #include "inputdata.h"
 #include "calculator.h"
 #include "readmatrix.hpp"
 #include "sharedlistvector.h"
+#include "validcalculator.h"
 
 /*The summary.shared() command
        The summary.shared command can only be executed after a successful read.shared command. 
@@ -44,20 +43,20 @@ public:
        int execute();
        
 private:
-       void getGroupComb();
        void getSharedVectors();
+       void setGroups();
        
        GlobalData* globaldata;
        ReadMatrix* read;
        vector<Calculator*> sumCalculators;     
        InputData* input;
+       ValidCalculators* validCalculator;
        SharedListVector* SharedList;
        SharedOrderVector* order;
        vector<SharedRAbundVector*> lookup;
        SharedRAbundVector* shared1, shared2;
-       string outputFileName;
+       string outputFileName, format;
        ofstream outputFileHandle;
-       vector<string> groupComb;
 
 };