X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=fileoutput.h;fp=fileoutput.h;h=3b73b148d88c7052421d48358c8ccdf0b39035ed;hb=51cf89e90eef8b300c2786eb1560dd89e6e83445;hp=7e9d8d26144be2150d75358e67da2a72a6dafb32;hpb=c537597ec5ebd47b4898da87ae03b0c2aeced354;p=mothur.git

diff --git a/fileoutput.h b/fileoutput.h
index 7e9d8d2..3b73b14 100644
--- a/fileoutput.h
+++ b/fileoutput.h
@@ -13,12 +13,13 @@ class FileOutput {
 public:
 	FileOutput(){};
 	~FileOutput(){};
-	virtual void output(int, vector<double>) = 0;
+	
 	virtual void initFile(string) = 0;
-	virtual void resetFile() = 0;
-	virtual string getFileName() = 0;
 	virtual void initFile(string, vector<string>) = 0;
+	virtual void output(int, vector<double>) = 0;
 	virtual void output(vector<double>) = 0;
+	virtual void resetFile() = 0;
+	virtual string getFileName() = 0;
 
 protected:
 	GlobalData* globaldata;
@@ -38,7 +39,7 @@ public:
 	void resetFile();
 	string getFileName()	{ return inName;	};
 	
-	void initFile(string, vector<string>) {};
+	void initFile(string, vector<string>){};
 	void output(vector<double>) {};
 
 private:
@@ -125,11 +126,11 @@ private:
 
 /***********************************************************************/
 
-class ThreeColumnFile2 : public FileOutput {
+class ColumnFile : public FileOutput {
 	
 public:
-	ThreeColumnFile2(string n) : FileOutput(), inName(n), counter(0), outName(getPathName(n) + ".temp." + getSimpleName(n)) { globaldata = GlobalData::getInstance(); };
-	~ThreeColumnFile2();
+	ColumnFile(string n) : FileOutput(), inName(n), counter(0), outName(getPathName(n) + ".temp." + getSimpleName(n)) { globaldata = GlobalData::getInstance(); };
+	~ColumnFile();
 	
 	//to make compatible with parent class
 	void output(int, vector<double>){};