X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=mothurout.h;h=1747b1480c732ae42f361940ff57dcbe151bbc7b;hp=ee602f404bd102f46f41214a3c3d938a51730a0c;hb=ac03f1f6c27b5bfdf2cfb6d45c3667c3e0281f51;hpb=89cfcfcc9e648d2f956f2ff419e64ba7907106d2 diff --git a/mothurout.h b/mothurout.h index ee602f4..1747b14 100644 --- a/mothurout.h +++ b/mothurout.h @@ -66,11 +66,9 @@ class MothurOut { vector getAllGroups() { sort(namesOfGroups.begin(), namesOfGroups.end()); return namesOfGroups; } vector Treenames; - //map names; vector sharedBinLabelsInFile; vector currentSharedBinLabels; vector listBinLabelsInFile; - //vector currentListBinLabels; string saveNextLabel, argv, sharedHeaderMode, groupMode; bool printedSharedHeaders, printedListHeaders, commandInputsConvertError, changedSeqNames, modifyNames; @@ -84,6 +82,7 @@ class MothurOut { vector setFilePosFasta(string, int&); string sortFile(string, string); int appendFiles(string, string); + int appendBinaryFiles(string, string); int appendFilesWithoutHeaders(string, string); int renameFile(string, string); //oldname, newname string getFullPathName(string); @@ -99,6 +98,8 @@ class MothurOut { int openOutputFileAppend(string, ofstream&); int openOutputFileBinaryAppend(string, ofstream&); int openInputFile(string, ifstream&); + int openInputFileBinary(string, ifstream&); + int openInputFileBinary(string, ifstream&, string); 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