X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=engine.cpp;h=23e3f6e119af2add01b95aa0d8c41f710b9b0a96;hb=36a8526766106bce1412e530e99f9c699dd59105;hp=5e56479f2851f89e324f8c62dc54250324da7d66;hpb=bfbc55964f1977da72c2cea984288a427d370a59;p=mothur.git diff --git a/engine.cpp b/engine.cpp index 5e56479..23e3f6e 100644 --- a/engine.cpp +++ b/engine.cpp @@ -12,21 +12,15 @@ */ using namespace std; - -#include "utilities.hpp" -#include "globaldata.hpp" -#include "commandoptionparser.hpp" -#include "command.hpp" -#include "commandfactory.hpp" -#include "errorchecking.h" #include "engine.hpp" /***********************************************************************/ -InteractEngine::InteractEngine(){ +InteractEngine::InteractEngine(string path){ globaldata = GlobalData::getInstance(); - + globaldata->argv = path; + system("clear"); // char buffer = ' '; // ifstream header("introtext.txt"); @@ -52,8 +46,8 @@ bool InteractEngine::getInput(){ bool errorFree; ErrorCheck* errorCheckor = new ErrorCheck(); - cout << "mothur v1.0" << endl; - cout << "Last updated: 1/29/2009" << endl << endl; + cout << "mothur v1.2.0" << endl; + cout << "Last updated: 4/14/2009" << endl << endl; cout << "by" << endl; cout << "Patrick D. Schloss" << endl << endl; cout << "Department of Microbiology" << endl; @@ -99,10 +93,11 @@ bool InteractEngine::getInput(){ /***********************************************************************/ //This function opens the batchfile to be used by BatchEngine::getInput. -BatchEngine::BatchEngine(string batchFileName){ +BatchEngine::BatchEngine(string path, string batchFileName){ try { globaldata = GlobalData::getInstance(); openedBatch = openInputFile(batchFileName, inputBatchFile); + globaldata->argv = path; system("clear");