adding labels to list file.

[mothur.git] / mothurout.h

diff --git a/mothurout.h b/mothurout.h
index 4a46e051b67bb08caee8c4d97f3947c366d01926..363a7a88041ac97bfd207558fc4fa445af7d442b 100644 (file)
--- a/mothurout.h
+++ b/mothurout.h
@@ -40,6 +40,7 @@ class MothurOut {
                void mothurOutEndLine(); //writes to cout and the logfile
                void mothurOut(string, ofstream&); //writes to the ofstream, cout and the logfile
                void mothurOutEndLine(ofstream&); //writes to the ofstream, cout and the logfile
+        void mothurOutJustToScreen(string); //writes to cout
                void mothurOutJustToLog(string);
                void errorOut(exception&, string, string);
                void closeLog();
@@ -66,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;
+               bool printedSharedHeaders, printedListHeaders, commandInputsConvertError, changedSeqNames, modifyNames;
                
                //functions from mothur.h
                //file operations
@@ -92,7 +95,9 @@ 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 
                string getline(ifstream&);
@@ -106,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);
@@ -133,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
@@ -150,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);
@@ -257,13 +272,15 @@ class MothurOut {
             counttablefile = "";
             summaryfile = "";
                        gui = false;
-                       printedHeaders = false;
+                       printedSharedHeaders = false;
+            printedListHeaders = false;
                        commandInputsConvertError = false;
             mothurCalling = false;
             debug = false;
                        sharedHeaderMode = "";
             groupMode = "group";
             changedSeqNames = false;
+            modifyNames = true;
                }
                ~MothurOut();