added mothur.h and fixed includes in many files

[mothur.git] / summarysharedcommand.h

diff --git a/summarysharedcommand.h b/summarysharedcommand.h
index ab1d7ac4d8af610748c5dab7c26f42e2ff320da5..0e3428d35721d19573153f04a4e19cd693cca6f3 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. 
@@ -50,11 +49,12 @@ private:
        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;
 
 };