changes while testing

[mothur.git] / engine.hpp

diff --git a/engine.hpp b/engine.hpp
index cbcc99aaf2cd8ebc48f6512eb9e88967df8e94b3..460e245bf5312d81f5b15d70387cf9ec63d472f6 100644 (file)
--- a/engine.hpp
+++ b/engine.hpp
@@ -13,12 +13,10 @@
 
 
 #include "mothur.h"
-#include "globaldata.hpp"
 #include "commandoptionparser.hpp"
 #include "command.hpp"
 #include "commandfactory.hpp"
-
-class GlobalData;
+#include "mothurout.h"
 
 class Engine {
 public:
@@ -26,11 +24,15 @@ public:
        virtual ~Engine(){}
        virtual bool getInput() = 0;
        virtual string getCommand();
-       virtual string getOutputDir()   {       return cFactory->getOutputDir();  }
+       virtual string getOutputDir()                   {       return cFactory->getOutputDir();        }
+       virtual string getLogFileName()                 {       return cFactory->getLogfileName();      }
+       virtual bool getAppend()                                {       return cFactory->getAppend();           }
+
        vector<string> getOptions()             {       return options;         }
 protected:
        vector<string> options;
        CommandFactory* cFactory;
+       MothurOut* mout;
 };
 
 
@@ -42,8 +44,8 @@ public:
        virtual bool getInput();
        int openedBatch;
 private:
-       GlobalData* globaldata;
        ifstream inputBatchFile;
+       string getNextCommand(ifstream&);
 
 };
 
@@ -55,7 +57,7 @@ public:
        ~InteractEngine();
        virtual bool getInput();
 private:
-       GlobalData* globaldata;
+       
 };
 
 
@@ -66,7 +68,6 @@ public:
        virtual bool getInput();
        int openedBatch;
 private:
-       GlobalData* globaldata;
        string listOfCommands;
        string getNextCommand(string&);