X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=mothurout.h;h=77b1b6d4ec1efb758973d332aa8e4df00619f58b;hp=845e6dd79fc5a7143b238d48bbc9deb1ae401df6;hb=b25ede2ad307ae76f8a610443e0ec3ec69621ce7;hpb=a8e2df1b96a57f5f29576b08361b86a96a8eff4f

diff --git a/mothurout.h b/mothurout.h
index 845e6dd..77b1b6d 100644
--- a/mothurout.h
+++ b/mothurout.h
@@ -107,6 +107,8 @@ class MothurOut {
         map<string, int> readNames(string);
         map<string, int> readNames(string, unsigned long int&);
         int readTax(string, map<string, string>&);
+        vector<consTax> readConsTax(string);
+        int readConsTax(string, map<string, consTax2>&);
         int readNames(string, map<string, string>&, map<string, int>&);
 		int readNames(string, map<string, string>&);
         int readNames(string, map<string, string>&, bool);
@@ -151,6 +153,7 @@ class MothurOut {
         string makeList(vector<string>&);
         bool isSubset(vector<string>, vector<string>); //bigSet, subset
         int checkName(string&);
+        map<string, vector<string> > parseClasses(string);
 		
 		//math operation
 		int factorial(int num);
@@ -163,6 +166,7 @@ class MothurOut {
         vector<double> getStandardDeviation(vector< vector<double> >&);
         vector<double> getStandardDeviation(vector< vector<double> >&, vector<double>&);
         vector<double> getAverages(vector< vector<double> >&);
+        double getAverage(vector<double>);
         vector< vector<seqDist> > getStandardDeviation(vector< vector< vector<seqDist> > >&);
         vector< vector<seqDist> > getStandardDeviation(vector< vector< vector<seqDist> > >&, vector< vector<seqDist> >&);
         vector< vector<seqDist> > getAverages(vector< vector< vector<seqDist> > >&, string);