started shared utilities, updates to venn and heatmap added tree.groups command

[mothur.git] / errorchecking.h

diff --git a/errorchecking.h b/errorchecking.h
index f7ddfa7f8cb4aa6ddf7d2d967e77bd7a8c23bc7e..3ddc65c962cbe35ec8e0d7acb0389e113efdc12f 100644 (file)
--- a/errorchecking.h
+++ b/errorchecking.h
@@ -9,13 +9,11 @@
  *
  */
 
-#include <Carbon/Carbon.h>
-#include <iostream>
-#include <map>
+#include "mothur.h"
 #include "globaldata.hpp"
 #include "validcommands.h"
 #include "validparameter.h"
-#include "validcalculator.h"
+
 
 class ErrorCheck {
        public:
@@ -27,20 +25,19 @@ class ErrorCheck {
                GlobalData* globaldata;
                ValidCommands* validCommand;
                ValidParameters* validParameter;
-               ValidCalculators* validCalculator;
-               void splitAtDash(string&, vector<string>&);
-               void splitAtDash(string&, set<int>&);
-               void splitAtDash(string&, set<string>&);
                void validateReadFiles();
                void validateReadDist();
                void validateReadPhil();
                void validateParseFiles();
+               void validateTreeFiles();
+               void validateBinFiles();
                void clear();
-               string phylipfile, columnfile, listfile, rabundfile, sabundfile, namefile, groupfile, orderfile, fastafile, cutoff, format; 
-               string precision, method, fileroot, label, line, iters, jumble, freq, single, rarefaction, shared, summary;
+               void refresh();
+               string phylipfile, columnfile, listfile, rabundfile, sabundfile, namefile, groupfile, orderfile, fastafile, treefile, sharedfile, cutoff, format; 
+               string precision, method, fileroot, label, line, iters, jumble, freq, single, rarefaction, shared, summary, randomtree, abund, sorted, scaler;
                string commandName, optionText;
                bool errorFree;
-               vector<string> singleEsimators, sharedEstimators, rareEstimators, summaryEstimators, sharedRareEstimators;
-               
+
+               vector<string> sharedGroups;
 };
-#endif
\ No newline at end of file
+#endif