X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=makegroupcommand.cpp;h=1c04fecb477d09e0e6de73b1307a3878fcc8e4b3;hb=4116449310d17a847470b84728cdefee5197e67e;hp=8dd1d67b294517437648f314321324ca8f1baf11;hpb=b4d2979ffc1440ffeac9343cc60ceb80fff0e058;p=mothur.git diff --git a/makegroupcommand.cpp b/makegroupcommand.cpp index 8dd1d67..1c04fec 100644 --- a/makegroupcommand.cpp +++ b/makegroupcommand.cpp @@ -10,20 +10,67 @@ #include "makegroupcommand.h" #include "sequence.hpp" +//********************************************************************************************************************** +vector MakeGroupCommand::getValidParameters(){ + try { + string Array[] = {"fasta", "output","groups","outputdir","inputdir"}; + vector myArray (Array, Array+(sizeof(Array)/sizeof(string))); + return myArray; + } + catch(exception& e) { + m->errorOut(e, "MakeGroupCommand", "getValidParameters"); + exit(1); + } +} +//********************************************************************************************************************** +MakeGroupCommand::MakeGroupCommand(){ + try { + abort = true; calledHelp = true; + vector tempOutNames; + outputTypes["group"] = tempOutNames; + } + catch(exception& e) { + m->errorOut(e, "MakeGroupCommand", "MakeGroupCommand"); + exit(1); + } +} +//********************************************************************************************************************** +vector MakeGroupCommand::getRequiredParameters(){ + try { + string Array[] = {"fasta","groups"}; + vector myArray (Array, Array+(sizeof(Array)/sizeof(string))); + return myArray; + } + catch(exception& e) { + m->errorOut(e, "MakeGroupCommand", "getRequiredParameters"); + exit(1); + } +} +//********************************************************************************************************************** +vector MakeGroupCommand::getRequiredFiles(){ + try { + vector myArray; + return myArray; + } + catch(exception& e) { + m->errorOut(e, "MakeGroupCommand", "getRequiredFiles"); + exit(1); + } +} //********************************************************************************************************************** MakeGroupCommand::MakeGroupCommand(string option) { try { - abort = false; + abort = false; calledHelp = false; //allow user to run help - if(option == "help") { help(); abort = true; } + if(option == "help") { help(); abort = true; calledHelp = true; } else { //valid paramters for this command - string AlignArray[] = {"fasta","groups","outputdir","inputdir"}; + string AlignArray[] = {"fasta","groups","output","outputdir","inputdir"}; vector myArray (AlignArray, AlignArray+(sizeof(AlignArray)/sizeof(string))); OptionParser parser(option); @@ -36,12 +83,14 @@ MakeGroupCommand::MakeGroupCommand(string option) { for (it = parameters.begin(); it != parameters.end(); it++) { if (validParameter.isValidParameter(it->first, myArray, it->second) != true) { abort = true; } } - + + //initialize outputTypes + vector tempOutNames; + outputTypes["group"] = tempOutNames; + //if the user changes the input directory command factory will send this info to us in the output parameter string inputDir = validParameter.validFile(parameters, "inputdir", false); if (inputDir == "not found"){ inputDir = ""; } - - filename = outputDir; fastaFileName = validParameter.validFile(parameters, "fasta", false); if (fastaFileName == "not found") { m->mothurOut("fasta is a required parameter for the make.group command."); m->mothurOutEndLine(); abort = true; } @@ -64,7 +113,21 @@ MakeGroupCommand::MakeGroupCommand(string option) { if (m->getDefaultPath() != "") { //default path is set string tryPath = m->getDefaultPath() + m->getSimpleName(fastaFileNames[i]); m->mothurOut("Unable to open " + fastaFileNames[i] + ". Trying default " + tryPath); m->mothurOutEndLine(); - ableToOpen = m->openInputFile(tryPath, in, "noerror"); + ifstream in2; + ableToOpen = m->openInputFile(tryPath, in2, "noerror"); + in2.close(); + fastaFileNames[i] = tryPath; + } + } + + //if you can't open it, try default location + if (ableToOpen == 1) { + if (m->getOutputDir() != "") { //default path is set + string tryPath = m->getOutputDir() + m->getSimpleName(fastaFileNames[i]); + m->mothurOut("Unable to open " + fastaFileNames[i] + ". Trying output directory " + tryPath); m->mothurOutEndLine(); + ifstream in2; + ableToOpen = m->openInputFile(tryPath, in2, "noerror"); + in2.close(); fastaFileNames[i] = tryPath; } } @@ -89,13 +152,17 @@ MakeGroupCommand::MakeGroupCommand(string option) { //if the user changes the output directory command factory will send this info to us in the output parameter outputDir = validParameter.validFile(parameters, "outputdir", false); if (outputDir == "not found"){ outputDir = ""; } + output = validParameter.validFile(parameters, "output", false); + if (output == "not found") { output = ""; } + else{ filename = output; } + groups = validParameter.validFile(parameters, "groups", false); if (groups == "not found") { m->mothurOut("groups is a required parameter for the make.group command."); m->mothurOutEndLine(); abort = true; } else { m->splitAtDash(groups, groupsNames); } if (groupsNames.size() != fastaFileNames.size()) { m->mothurOut("You do not have the same number of valid fastfile files as groups. This could be because we could not open a fastafile."); m->mothurOutEndLine(); abort = true; } } - + cout << "here" << endl; } catch(exception& e) { m->errorOut(e, "MakeGroupCommand", "MakeGroupCommand"); @@ -112,9 +179,10 @@ MakeGroupCommand::~MakeGroupCommand(){ } void MakeGroupCommand::help(){ try { m->mothurOut("The make.group command reads a fasta file or series of fasta files and creates a groupfile.\n"); - m->mothurOut("The make.group command parameters are fasta and groups, both are required.\n"); + m->mothurOut("The make.group command parameters are fasta, groups and output. Fasta and group are required.\n"); + m->mothurOut("The output parameter allows you to specify the name of groupfile created. \n"); m->mothurOut("The make.group command should be in the following format: \n"); - m->mothurOut("make.group(fasta=yourFastaFiles, groups=yourGroups. \n"); + m->mothurOut("make.group(fasta=yourFastaFiles, groups=yourGroups). \n"); m->mothurOut("Example make.group(fasta=seqs1.fasta-seq2.fasta-seqs3.fasta, groups=A-B-C)\n"); m->mothurOut("Note: No spaces between parameter labels (i.e. fasta), '=' and parameters (i.e.yourFastaFiles).\n\n"); } @@ -129,10 +197,10 @@ void MakeGroupCommand::help(){ int MakeGroupCommand::execute(){ try { - if (abort == true) { return 0; } + if (abort == true) { if (calledHelp) { return 0; } return 2; } if (outputDir == "") { outputDir = m->hasPath(fastaFileNames[0]); } - + filename = outputDir + filename; ofstream out; @@ -140,7 +208,7 @@ int MakeGroupCommand::execute(){ for (int i = 0; i < fastaFileNames.size(); i++) { - if (m->control_pressed) { out.close(); remove(filename.c_str()); return 0; } + if (m->control_pressed) { outputTypes.clear(); out.close(); remove(filename.c_str()); return 0; } ifstream in; m->openInputFile(fastaFileNames[i], in); @@ -149,7 +217,7 @@ int MakeGroupCommand::execute(){ Sequence seq(in, "no align"); m->gobble(in); - if (m->control_pressed) { in.close(); out.close(); remove(filename.c_str()); return 0; } + if (m->control_pressed) { outputTypes.clear(); in.close(); out.close(); remove(filename.c_str()); return 0; } if (seq.getName() != "") { out << seq.getName() << '\t' << groupsNames[i] << endl; } } @@ -159,7 +227,7 @@ int MakeGroupCommand::execute(){ out.close(); m->mothurOutEndLine(); - m->mothurOut("Output File Name: " + filename); m->mothurOutEndLine(); + m->mothurOut("Output File Name: " + filename); m->mothurOutEndLine(); outputNames.push_back(filename); outputTypes["group"].push_back(filename); m->mothurOutEndLine(); return 0;