modified trim.seqs to split by primer name if primer name is given, and warn if dupli...

[mothur.git] / mothurout.h

diff --git a/mothurout.h b/mothurout.h
index d2ba6b94f0b12a6bd31df7763e0d4b32d705d3ea..bf356ae285fba010f41f2bbc51b9ce093ead1b1b 100644 (file)
--- a/mothurout.h
+++ b/mothurout.h
@@ -1,46 +1,48 @@
-#ifndef MOTHUROUT_H\r
-#define MOTHUROUT_H\r
-\r
-/*\r
- *  mothurOut.h\r
- *  Mothur\r
- *\r
- *  Created by westcott on 2/25/10.\r
- *  Copyright 2010 Schloss Lab. All rights reserved.\r
- *\r
- */\r
-\r
-#include "mothur.h"\r
-\r
-/***********************************************/\r
-\r
-class MothurOut {\r
-       \r
-       public:\r
-               static MothurOut* getInstance();\r
-               void setFileName(string);\r
-               \r
-               void mothurOut(string);\r
-               void mothurOutEndLine();\r
-               void mothurOutJustToLog(string);\r
-               void errorOut(exception&, string, string);\r
-               void closeLog();\r
-\r
-               int control_pressed;\r
-               bool executing;\r
-\r
-       private:\r
-               static MothurOut* _uniqueInstance;\r
-               MothurOut( const MothurOut& ); // Disable copy constructor\r
-               void operator=( const MothurOut& ); // Disable assignment operator\r
-               MothurOut() { control_pressed = false; };\r
-               ~MothurOut();\r
-\r
-               string logFileName;\r
-               ofstream out;\r
-\r
-};\r
-/***********************************************/\r
-\r
-#endif\r
-\r
+#ifndef MOTHUROUT_H
+#define MOTHUROUT_H
+
+/*
+ *  mothurOut.h
+ *  Mothur
+ *
+ *  Created by westcott on 2/25/10.
+ *  Copyright 2010 Schloss Lab. All rights reserved.
+ *
+ */
+
+#include "mothur.h"
+
+/***********************************************/
+
+class MothurOut {
+       
+       public:
+               static MothurOut* getInstance();
+               void setFileName(string);
+               
+               void mothurOut(string);
+               void mothurOutEndLine();
+               void mothurOutJustToLog(string);
+               void errorOut(exception&, string, string);
+               void closeLog();
+
+               int control_pressed;
+               bool executing;
+
+       private:
+               static MothurOut* _uniqueInstance;
+               MothurOut( const MothurOut& ); // Disable copy constructor
+               void operator=( const MothurOut& ); // Disable assignment operator
+               MothurOut() { control_pressed = false; };
+               ~MothurOut();
+
+               string logFileName;
+               ofstream out;
+               
+               int mem_usage(double&, double&);
+
+};
+/***********************************************/
+
+#endif
+