fixed unweighted calculator

[mothur.git] / errorchecking.h

diff --git a/errorchecking.h b/errorchecking.h
index d1e2f82451cc3f5d5e4be6d7496894d6b884e9cc..50cc00511a08fa71754d2dbf51fd76406d2925ea 100644 (file)
--- a/errorchecking.h
+++ b/errorchecking.h
@@ -9,12 +9,11 @@
  *
  */
 
-#include <iostream>
-#include <map>
+#include "mothur.h"
 #include "globaldata.hpp"
 #include "validcommands.h"
 #include "validparameter.h"
-#include "validcalculator.h"
+#include "utilities.hpp"
 
 class ErrorCheck {
        public:
@@ -26,21 +25,24 @@ 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();
+       //      bool validCommandParameter(string, string);
+       //      bool validParameterValue(string, string);
                void validateReadDist();
                void validateReadPhil();
                void validateParseFiles();
                void validateTreeFiles();
                void clear();
-               string phylipfile, columnfile, listfile, rabundfile, sabundfile, namefile, groupfile, orderfile, fastafile, treefile, 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;
                string commandName, optionText;
                bool errorFree;
-               vector<string> singleEsimators, sharedEstimators, rareEstimators, summaryEstimators, sharedRareEstimators;
-               
+
+               vector<string> sharedGroups;
+       //      map <string, vector<string> > commandParameters;
+       ///     map <string, vector<double> > intParams;
+       //      double piSent;
+
 };
 #endif