X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=getrabundcommand.cpp;h=b7dd7153609ada80c297d5d51cab70d3cae5ebc4;hb=a98eb683e17d8e49583bf2d215ab7562a4cdca75;hp=2ed5b7be71e13b5369f4cc71aaab72258960d41f;hpb=72ebb6fa35b45b149812d47c2b1cb8acaca64659;p=mothur.git diff --git a/getrabundcommand.cpp b/getrabundcommand.cpp index 2ed5b7b..b7dd715 100644 --- a/getrabundcommand.cpp +++ b/getrabundcommand.cpp @@ -11,7 +11,7 @@ //********************************************************************************************************************** -GetRAbundCommand::GetRAbundCommand(string option){ +GetRAbundCommand::GetRAbundCommand(string option) { try { globaldata = GlobalData::getInstance(); abort = false; @@ -23,7 +23,7 @@ GetRAbundCommand::GetRAbundCommand(string option){ else { //valid paramters for this command - string Array[] = {"label","sorted"}; + string Array[] = {"label","sorted","outputdir","inputdir"}; vector myArray (Array, Array+(sizeof(Array)/sizeof(string))); OptionParser parser(option); @@ -36,20 +36,26 @@ GetRAbundCommand::GetRAbundCommand(string option){ if (validParameter.isValidParameter(it->first, myArray, it->second) != true) { abort = true; } } + //if the user changes the output directory command factory will send this info to us in the output parameter + string outputDir = validParameter.validFile(parameters, "outputdir", false); if (outputDir == "not found"){ + outputDir = ""; + outputDir += m->hasPath(globaldata->inputFileName); //if user entered a file with a path then preserve it + } + //make sure the user has already run the read.otu command - if (globaldata->getListFile() == "") { mothurOut("You must read a listfile before you can use the get.rabund command."); mothurOutEndLine(); abort = true; } + if (globaldata->getListFile() == "") { m->mothurOut("You must read a listfile before you can use the get.rabund command."); m->mothurOutEndLine(); abort = true; } //check for optional parameter and set defaults // ...at some point should added some additional type checking... string temp; temp = validParameter.validFile(parameters, "sorted", false); if (temp == "not found") { temp = "T"; } - sorted = isTrue(temp); + sorted = m->isTrue(temp); label = validParameter.validFile(parameters, "label", false); if (label == "not found") { label = ""; } else { - if(label != "all") { splitAtDash(label, labels); allLines = 0; } + if(label != "all") { m->splitAtDash(label, labels); allLines = 0; } else { allLines = 1; } } @@ -60,14 +66,14 @@ GetRAbundCommand::GetRAbundCommand(string option){ } if (abort == false) { - filename = getRootName(globaldata->inputFileName) + "rabund"; - openOutputFile(filename, out); + filename = outputDir + m->getRootName(m->getSimpleName(globaldata->inputFileName)) + "rabund"; + m->openOutputFile(filename, out); } } } catch(exception& e) { - errorOut(e, "GetRAbundCommand", "GetRAbundCommand"); + m->errorOut(e, "GetRAbundCommand", "GetRAbundCommand"); exit(1); } } @@ -75,27 +81,25 @@ GetRAbundCommand::GetRAbundCommand(string option){ void GetRAbundCommand::help(){ try { - mothurOut("The get.rabund command can only be executed after a successful read.otu of a listfile.\n"); - mothurOut("The get.rabund command parameters are label and sorted. No parameters are required.\n"); - mothurOut("The label parameter allows you to select what distance levels you would like included in your .rabund file, and are separated by dashes.\n"); - mothurOut("The sorted parameters allows you to print the rabund results sorted by abundance or not. The default is sorted.\n"); - mothurOut("The get.rabund command should be in the following format: get.rabund(label=yourLabels, sorted=yourSorted).\n"); - mothurOut("Example get.rabund(sorted=F).\n"); - mothurOut("The default value for label is all labels in your inputfile.\n"); - mothurOut("The get.rabund command outputs a .rabund file containing the lines you selected.\n"); - mothurOut("Note: No spaces between parameter labels (i.e. label), '=' and parameters (i.e.yourLabels).\n\n"); + m->mothurOut("The get.rabund command can only be executed after a successful read.otu of a listfile.\n"); + m->mothurOut("The get.rabund command parameters are label and sorted. No parameters are required.\n"); + m->mothurOut("The label parameter allows you to select what distance levels you would like included in your .rabund file, and are separated by dashes.\n"); + m->mothurOut("The sorted parameters allows you to print the rabund results sorted by abundance or not. The default is sorted.\n"); + m->mothurOut("The get.rabund command should be in the following format: get.rabund(label=yourLabels, sorted=yourSorted).\n"); + m->mothurOut("Example get.rabund(sorted=F).\n"); + m->mothurOut("The default value for label is all labels in your inputfile.\n"); + m->mothurOut("The get.rabund command outputs a .rabund file containing the lines you selected.\n"); + m->mothurOut("Note: No spaces between parameter labels (i.e. label), '=' and parameters (i.e.yourLabels).\n\n"); } catch(exception& e) { - errorOut(e, "GetRAbundCommand", "help"); + m->errorOut(e, "GetRAbundCommand", "help"); exit(1); } } //********************************************************************************************************************** -GetRAbundCommand::~GetRAbundCommand(){ - if (abort == false) { globaldata->gListVector = NULL; } -} +GetRAbundCommand::~GetRAbundCommand(){} //********************************************************************************************************************** @@ -116,13 +120,18 @@ int GetRAbundCommand::execute(){ set processedLabels; set userLabels = labels; + if (m->control_pressed) { out.close(); remove(filename.c_str()); delete list; globaldata->gListVector = NULL; return 0; } + while((list != NULL) && ((allLines == 1) || (userLabels.size() != 0))) { if(allLines == 1 || labels.count(list->getLabel()) == 1){ - mothurOut(list->getLabel()); mothurOutEndLine(); + m->mothurOut(list->getLabel()); m->mothurOutEndLine(); rabund = new RAbundVector(); *rabund = (list->getRAbundVector()); + if (m->control_pressed) { out.close(); remove(filename.c_str()); delete list; delete rabund; globaldata->gListVector = NULL; return 0; } + + if(sorted) { rabund->print(out); } else { rabund->nonSortedPrint(out); } @@ -132,16 +141,18 @@ int GetRAbundCommand::execute(){ userLabels.erase(list->getLabel()); } - if ((anyLabelsToProcess(list->getLabel(), userLabels, "") == true) && (processedLabels.count(lastLabel) != 1)) { + if ((m->anyLabelsToProcess(list->getLabel(), userLabels, "") == true) && (processedLabels.count(lastLabel) != 1)) { string saveLabel = list->getLabel(); delete list; list = input->getListVector(lastLabel); - mothurOut(list->getLabel()); mothurOutEndLine(); + m->mothurOut(list->getLabel()); m->mothurOutEndLine(); rabund = new RAbundVector(); *rabund = (list->getRAbundVector()); + if (m->control_pressed) { out.close(); remove(filename.c_str()); delete list; delete rabund; globaldata->gListVector = NULL; return 0; } + if(sorted) { rabund->print(out); } else { rabund->nonSortedPrint(out); } @@ -164,12 +175,12 @@ int GetRAbundCommand::execute(){ set::iterator it; bool needToRun = false; for (it = userLabels.begin(); it != userLabels.end(); it++) { - mothurOut("Your file does not include the label " + *it); + m->mothurOut("Your file does not include the label " + *it); if (processedLabels.count(lastLabel) != 1) { - mothurOut(". I will use " + lastLabel + "."); mothurOutEndLine(); + m->mothurOut(". I will use " + lastLabel + "."); m->mothurOutEndLine(); needToRun = true; }else { - mothurOut(". Please refer to " + lastLabel + "."); mothurOutEndLine(); + m->mothurOut(". Please refer to " + lastLabel + "."); m->mothurOutEndLine(); } } @@ -178,23 +189,33 @@ int GetRAbundCommand::execute(){ if (list != NULL) { delete list; } list = input->getListVector(lastLabel); - mothurOut(list->getLabel()); mothurOutEndLine(); + m->mothurOut(list->getLabel()); m->mothurOutEndLine(); rabund = new RAbundVector(); *rabund = (list->getRAbundVector()); + if (m->control_pressed) { out.close(); remove(filename.c_str()); delete list; delete rabund; globaldata->gListVector = NULL; return 0; } + if(sorted) { rabund->print(out); } else { rabund->nonSortedPrint(out); } delete rabund; delete list; } - + + m->mothurOutEndLine(); + m->mothurOut("Output File Name: "); m->mothurOutEndLine(); + m->mothurOut(filename); m->mothurOutEndLine(); + m->mothurOutEndLine(); + out.close(); + + globaldata->gListVector = NULL; + return 0; } catch(exception& e) { - errorOut(e, "GetRAbundCommand", "execute"); + m->errorOut(e, "GetRAbundCommand", "execute"); exit(1); } }