fixed some bugs found while testing 1.8

[mothur.git] / fileoutput.h

diff --git a/fileoutput.h b/fileoutput.h
index 209dd1b1772cc1f58e18cce4826ffcddd541d278..17bd7a1d7d23dd6a86ae2ea2ec5e5c16e9665171 100644 (file)
--- a/fileoutput.h
+++ b/fileoutput.h
@@ -2,7 +2,6 @@
 #define FILEOUTPUT_H
 
 #include "mothur.h"
-#include "globaldata.hpp"
 
 /***********************************************************************/
 
@@ -10,7 +9,7 @@ class FileOutput {
        
 public:
        FileOutput(){};
-       ~FileOutput(){};
+       virtual ~FileOutput(){};
        
        virtual void initFile(string) = 0;
        virtual void initFile(string, vector<string>) = 0;
@@ -20,7 +19,6 @@ public:
        virtual string getFileName() = 0;
 
 protected:
-       GlobalData* globaldata;
        int renameOk;
 
 };     
@@ -30,7 +28,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>);
@@ -54,7 +52,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);
@@ -78,7 +76,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);
@@ -103,7 +101,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>);
@@ -127,7 +125,7 @@ private:
 class ColumnFile : public FileOutput {
        
 public:
-       ColumnFile(string n, string i) : FileOutput(), iters(i), inName(n), counter(0), outName(getPathName(n) + ".temp") { globaldata = GlobalData::getInstance(); };
+       ColumnFile(string n, string i) : FileOutput(), iters(i), inName(n), counter(0), outName(n + ".temp") {};
        ~ColumnFile();
        
        //to make compatible with parent class
@@ -147,6 +145,6 @@ private:
        string iters;
 };
 
-/***********************************************************************/
+
 
 #endif