X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=fileoutput.h;h=170ee68a8151e9252788364c13a09de58b192815;hp=a047a20cffd5cb9c4ac50fbf2cf0b1bb335180cb;hb=cf9987b67aa49777a4c91c2d21f96e58bf17aa82;hpb=02909d6cae9963ba00dc746969a370fa8ca934fc

diff --git a/fileoutput.h b/fileoutput.h
index a047a20..170ee68 100644
--- a/fileoutput.h
+++ b/fileoutput.h
@@ -2,13 +2,14 @@
 #define FILEOUTPUT_H
 
 #include "mothur.h"
+#include "mothurout.h"
 
 /***********************************************************************/
 
 class FileOutput {
 	
 public:
-	FileOutput(){};
+	FileOutput(){ m = MothurOut::getInstance(); }
 	virtual ~FileOutput(){};
 	
 	virtual void initFile(string) = 0;
@@ -20,6 +21,7 @@ public:
 
 protected:
 	int renameOk;
+	MothurOut* m;
 
 };	
 	
@@ -28,7 +30,7 @@ protected:
 class ThreeColumnFile : public FileOutput {
 	
 public:
-	ThreeColumnFile(string n) : FileOutput(), inName(n), counter(0), outName(getPathName(n) + ".temp") { };
+	ThreeColumnFile(string n) : FileOutput(), inName(n), counter(0), outName(n + ".temp") { };
 	~ThreeColumnFile();
 	void initFile(string);
 	void output(int, vector<double>);
@@ -52,7 +54,7 @@ class OneColumnFile : public FileOutput {
 	
 	
 public:
-	OneColumnFile(string n) : inName(n), counter(0), outName(getPathName(n) + ".temp") {};
+	OneColumnFile(string n) : inName(n), counter(0), outName(n + ".temp") {};
 	~OneColumnFile();
 	void output(int, vector<double>);
 	void initFile(string);
@@ -76,7 +78,7 @@ class SharedOneColumnFile : public FileOutput {
 	
 	
 public:
-	SharedOneColumnFile(string n) : inName(n), counter(0), outName(getPathName(n) + ".temp") {};
+	SharedOneColumnFile(string n) : inName(n), counter(0), outName(n + ".temp") {};
 	~SharedOneColumnFile();
 	void output(int, vector<double>);
 	void initFile(string);
@@ -101,7 +103,7 @@ private:
 class SharedThreeColumnFile : public FileOutput {
 	
 public:
-	SharedThreeColumnFile(string n, string groups) : FileOutput(), groupLabel(groups), inName(n), counter(0), numGroup(1), outName(getPathName(n) + ".temp") {	};
+	SharedThreeColumnFile(string n, string groups) : FileOutput(), groupLabel(groups), inName(n), counter(0), numGroup(1), outName(n + ".temp") {	};
 	~SharedThreeColumnFile();
 	void initFile(string);
 	void output(int, vector<double>);
@@ -125,7 +127,7 @@ private:
 class ColumnFile : public FileOutput {
 	
 public:
-	ColumnFile(string n, string i) : FileOutput(), iters(i), inName(n), counter(0), outName(getPathName(n) + ".temp") {};
+	ColumnFile(string n, string i) : FileOutput(), iters(i), inName(n), counter(0), outName(n + ".temp") {};
 	~ColumnFile();
 	
 	//to make compatible with parent class
@@ -145,6 +147,6 @@ private:
 	string iters;
 };
 
-/***********************************************************************/
+
 
 #endif