X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=engine.hpp;h=460e245bf5312d81f5b15d70387cf9ec63d472f6;hp=3aabf13de009dac3205d00c130d734d98de88dda;hb=bd27c2b0612942815b7417c79f7ee41f669a2a34;hpb=4ba6188707e67c638ea5ee3c787d5d07ccd07e3e

diff --git a/engine.hpp b/engine.hpp
index 3aabf13..460e245 100644
--- a/engine.hpp
+++ b/engine.hpp
@@ -13,24 +13,26 @@
 
 
 #include "mothur.h"
-#include "globaldata.hpp"
 #include "commandoptionparser.hpp"
 #include "command.hpp"
 #include "commandfactory.hpp"
-
-class GlobalData;
+#include "mothurout.h"
 
 class Engine {
 public:
-	Engine() {  cFactory = new CommandFactory();	}
-	virtual ~Engine(){  delete cFactory;  }
+	Engine(); 
+	virtual ~Engine(){}
 	virtual bool getInput() = 0;
 	virtual string getCommand();
-	vector<string> getOptions() {	return options;		}
-	virtual void terminateCommand(int);
+	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&);