version working on mac with .tellg changed to unget for windows

[mothur.git] / summarycommand.h

diff --git a/summarycommand.h b/summarycommand.h
index 1f24cd433f5db9b4f6d5e9512294449529cafc58..b12f76f4e9812b7d26de87769d746167fe3552c1 100644 (file)
--- a/summarycommand.h
+++ b/summarycommand.h
@@ -9,15 +9,12 @@
  *
  */
 
-#include <Carbon/Carbon.h>
-#include <iostream>
-#include <fstream>
-#include <vector>
 #include "command.hpp"
 #include "sabundvector.hpp"
 #include "inputdata.h"
 #include "calculator.h"
-#include "readmatrix.hpp"
+#include "readotu.h"
+#include "validcalculator.h"
 
 /* The summary() command:
        The summary command can only be executed after a successful read.list, read.sabund or read.rabund command, with one exception. 
@@ -36,17 +33,27 @@ class GlobalData;
 class SummaryCommand : public Command {
 
 public:
-       SummaryCommand();
+       SummaryCommand(string);
        ~SummaryCommand();
        int execute();
+       void help();
        
 private:
        GlobalData* globaldata;
-       ReadMatrix* read;
+       ReadOTUFile* read;
        vector<Calculator*> sumCalculators;     
        InputData* input;
+       ValidCalculators* validCalculator;
        SAbundVector* sabund;
        string outputFileName;
        ofstream outputFileHandle;
+       int abund, size;
+
+       bool abort, allLines;
+       set<int> lines; //hold lines to be used
+       set<string> labels; //holds labels to be used
+       string line, label, calc;
+       vector<string>  Estimators;
+
 };
-#endif
\ No newline at end of file
+#endif