added summary.tax command and fixed bug with root level totals in tax.summary file

[mothur.git] / mothurout.h

diff --git a/mothurout.h b/mothurout.h
index 6f04f892dbb588700c884d27071fb613457fb35b..0c45a30387b3164f8aceed5ffbd92b9982aa49a6 100644 (file)
--- a/mothurout.h
+++ b/mothurout.h
@@ -57,12 +57,12 @@ class MothurOut {
                
                //functions from mothur.h
                //file operations
-               vector<unsigned long int> divideFile(string, int&);
+               vector<unsigned long long> divideFile(string, int&);
                int divideFile(string, int&, vector<string>&);
-               vector<unsigned long int> setFilePosEachLine(string, int&);
-               vector<unsigned long int> setFilePosFasta(string, int&);
+               vector<unsigned long long> setFilePosEachLine(string, int&);
+               vector<unsigned long long> setFilePosFasta(string, int&);
                string sortFile(string, string);
-               void appendFiles(string, string);
+               int appendFiles(string, string);
                int renameFile(string, string); //oldname, newname
                string getFullPathName(string);
                string hasPath(string);
@@ -81,6 +81,7 @@ class MothurOut {
                void gobble(istringstream&);
                map<string, int> readNames(string);
                int readNames(string, map<string, string>&);
+               int readNames(string, map<string, vector<string> >&);
                int readNames(string, vector<seqPriorityNode>&, map<string, string>&);
                void mothurRemove(string);