X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=mothurout.h;h=363a7a88041ac97bfd207558fc4fa445af7d442b;hb=499f4ac6e321f9f03d4c3aa25c3b6880892c8b83;hp=3cf6fa4963672b5d69acb7de389eb266b957ba24;hpb=875ab4b2eec77b920e9fa0042f9a2aae2faff2b0;p=mothur.git

diff --git a/mothurout.h b/mothurout.h
index 3cf6fa4..363a7a8 100644
--- a/mothurout.h
+++ b/mothurout.h
@@ -67,10 +67,12 @@ class MothurOut {
 		vector<string> getAllGroups() { sort(namesOfGroups.begin(), namesOfGroups.end()); return namesOfGroups; }
 		vector<string> Treenames;
 		//map<string, string> names;
-		vector<string> binLabelsInFile;
-		vector<string> currentBinLabels;
+		vector<string> sharedBinLabelsInFile;
+		vector<string> currentSharedBinLabels;
+        vector<string> listBinLabelsInFile;
+        //vector<string> currentListBinLabels;
 		string saveNextLabel, argv, sharedHeaderMode, groupMode;
-		bool printedHeaders, commandInputsConvertError, changedSeqNames, modifyNames;
+		bool printedSharedHeaders, printedListHeaders, commandInputsConvertError, changedSeqNames, modifyNames;
 		
 		//functions from mothur.h
 		//file operations
@@ -138,6 +140,9 @@ class MothurOut {
 		bool isTrue(string);
 		bool isContainingOnlyDigits(string);
 		bool isNumeric1(string);
+        bool isLabelEquivalent(string, string);
+        string getSimpleLabel(string);
+        string findEdianness();
 	
 		
 		//string manipulation
@@ -158,11 +163,14 @@ class MothurOut {
         map<string, vector<string> > parseClasses(string);
 		
 		//math operation
+        double max(vector<double>&); //returns largest value in vector
+        double min(vector<double>&); //returns smallest value in vector
 		int factorial(int num);
 		vector<vector<double> > binomial(int);
 		float ceilDist(float, int);
 		float roundDist(float, int);
 		unsigned int fromBase36(string);
+        double median(vector<double>);
 		int getRandomIndex(int); //highest
         double getStandardDeviation(vector<int>&);
         vector<double> getStandardDeviation(vector< vector<double> >&);
@@ -264,7 +272,8 @@ class MothurOut {
             counttablefile = "";
             summaryfile = "";
 			gui = false;
-			printedHeaders = false;
+			printedSharedHeaders = false;
+            printedListHeaders = false;
 			commandInputsConvertError = false;
             mothurCalling = false;
             debug = false;