X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mothurout.h;h=db931b5a5e380169c3147ee8b0c9acb4d72f1a00;hb=2ff2d03fbe46ce8cf2738bff4403a52be4f31e2f;hp=643ecd58a149aebc1ac88f500d4658de98d5e145;hpb=c48d91112209b841444923670dca5454da0e2a4d;p=mothur.git

diff --git a/mothurout.h b/mothurout.h
index 643ecd5..db931b5 100644
--- a/mothurout.h
+++ b/mothurout.h
@@ -70,7 +70,7 @@ class MothurOut {
 		vector<string> binLabelsInFile;
 		vector<string> currentBinLabels;
 		string saveNextLabel, argv, sharedHeaderMode, groupMode;
-		bool printedHeaders, commandInputsConvertError, changedSeqNames;
+		bool printedHeaders, commandInputsConvertError, changedSeqNames, modifyNames;
 		
 		//functions from mothur.h
 		//file operations
@@ -93,9 +93,13 @@ class MothurOut {
 		string getRootName(string);
 		bool isBlank(string);
 		int openOutputFile(string, ofstream&);
+        int openOutputFileBinary(string, ofstream&);
 		int openOutputFileAppend(string, ofstream&);
+        int openOutputFileBinaryAppend(string, ofstream&);
 		int openInputFile(string, ifstream&);
-		int openInputFile(string, ifstream&, string); //no error given 
+		int openInputFile(string, ifstream&, string); //no error given
+    
+        bool checkLocations(string&, string);  //filename, inputDir. checks for file in ./, inputdir, default and mothur's exe location.  Returns false if cant be found. If found completes name with location
 		string getline(ifstream&);
 		string getline(istringstream&);
 		void gobble(istream&);
@@ -107,6 +111,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);
@@ -134,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
@@ -151,18 +160,23 @@ 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
+        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> >&);
         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);
@@ -265,6 +279,7 @@ class MothurOut {
 			sharedHeaderMode = "";
             groupMode = "group";
             changedSeqNames = false;
+            modifyNames = true;
 		}
 		~MothurOut();