X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=summarysharedcommand.h;h=248c1c8ecb81f2bbc069b25151c3908e05330907;hb=2d2fbc80f9359b19873ba3e63970b58f4f8f49f3;hp=24ce04b8f278e0a4dd938831a8fe9a434dc047f5;hpb=fd282e6b4be2560f5b1bd154a9e8d24b798eefaf;p=mothur.git

diff --git a/summarysharedcommand.h b/summarysharedcommand.h
index 24ce04b..248c1c8 100644
--- a/summarysharedcommand.h
+++ b/summarysharedcommand.h
@@ -9,16 +9,14 @@
  *
  */
 
-#include <Carbon/Carbon.h>
-#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. 
@@ -45,21 +43,21 @@ 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;
 
 };
 
-#endif
\ No newline at end of file
+#endif