X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=engine.hpp;h=5311da9e1e3aafb3c447b2e51ec411cb29c79d14;hb=72e0be6b9c80009d4dbee24e8d690ad9514dc6fb;hp=0020a7f8d9d83a24b5b24c60fb0f86263edd5e44;hpb=84f93a9e670eb7f7e69e0468b9be4c53890c07f2;p=mothur.git diff --git a/engine.hpp b/engine.hpp index 0020a7f..5311da9 100644 --- a/engine.hpp +++ b/engine.hpp @@ -13,14 +13,11 @@ #include "mothur.h" -#include "globaldata.hpp" #include "commandoptionparser.hpp" #include "command.hpp" #include "commandfactory.hpp" #include "mothurout.h" -class GlobalData; - class Engine { public: Engine(); @@ -36,6 +33,7 @@ protected: vector options; CommandFactory* cFactory; MothurOut* mout; + string findMothursPath(); }; @@ -47,8 +45,8 @@ public: virtual bool getInput(); int openedBatch; private: - GlobalData* globaldata; ifstream inputBatchFile; + string getNextCommand(ifstream&); }; @@ -60,7 +58,7 @@ public: ~InteractEngine(); virtual bool getInput(); private: - GlobalData* globaldata; + }; @@ -71,7 +69,6 @@ public: virtual bool getInput(); int openedBatch; private: - GlobalData* globaldata; string listOfCommands; string getNextCommand(string&);