X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mothurout.h;h=f99eac1917cbe2ce5a1ce278c66d27d1df71737e;hb=ace98dda2bb2e1cffd6755fb8a27e5080af66f2b;hp=4a46e051b67bb08caee8c4d97f3947c366d01926;hpb=a54ba6143022dc7294f4fdc468fc10b627c64b0e;p=mothur.git diff --git a/mothurout.h b/mothurout.h index 4a46e05..f99eac1 100644 --- 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(); @@ -69,7 +70,7 @@ class MothurOut { vector binLabelsInFile; vector currentBinLabels; string saveNextLabel, argv, sharedHeaderMode, groupMode; - bool printedHeaders, commandInputsConvertError, changedSeqNames; + bool printedHeaders, commandInputsConvertError, changedSeqNames, modifyNames; //functions from mothur.h //file operations @@ -162,6 +163,7 @@ class MothurOut { vector getStandardDeviation(vector< vector >&); vector getStandardDeviation(vector< vector >&, vector&); vector getAverages(vector< vector >&); + double getAverage(vector); vector< vector > getStandardDeviation(vector< vector< vector > >&); vector< vector > getStandardDeviation(vector< vector< vector > >&, vector< vector >&); vector< vector > getAverages(vector< vector< vector > >&, string); @@ -264,6 +266,7 @@ class MothurOut { sharedHeaderMode = ""; groupMode = "group"; changedSeqNames = false; + modifyNames = true; } ~MothurOut();