X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=anosimcommand.cpp;h=c5cb4d60c751d6614b82cd961c29d9e645fcbaa8;hb=c651c46022761aef61644f78462365d8f767ff0b;hp=2ee691ea9cb0db6f3a98ff299d0a1f9c6f60bbaf;hpb=1d898dc6edaf9e9f287fab53bf1f21fb29757a17;p=mothur.git diff --git a/anosimcommand.cpp b/anosimcommand.cpp index 2ee691e..c5cb4d6 100644 --- a/anosimcommand.cpp +++ b/anosimcommand.cpp @@ -71,6 +71,7 @@ AnosimCommand::AnosimCommand(string option) { //allow user to run help if(option == "help") { help(); abort = true; calledHelp = true; } + else if(option == "citation") { citation(); abort = true; calledHelp = true;} else { vector myArray = setParameters(); @@ -123,17 +124,17 @@ AnosimCommand::AnosimCommand(string option) { if (phylipFileName != "") { m->mothurOut("Using " + phylipFileName + " as input file for the phylip parameter."); m->mothurOutEndLine(); } else { m->mothurOut("You have no current phylip file and the phylip parameter is required."); m->mothurOutEndLine(); abort = true; } - } + }else { m->setPhylipFile(phylipFileName); } //check for required parameters designFileName = validParameter.validFile(parameters, "design", true); - if (designFileName == "not open") { abort = true; } + if (designFileName == "not open") { designFileName = ""; abort = true; } else if (designFileName == "not found") { //if there is a current design file, use it designFileName = m->getDesignFile(); if (designFileName != "") { m->mothurOut("Using " + designFileName + " as input file for the design parameter."); m->mothurOutEndLine(); } else { m->mothurOut("You have no current design file and the design parameter is required."); m->mothurOutEndLine(); abort = true; } - } + }else { m->setDesignFile(designFileName); } string temp = validParameter.validFile(parameters, "iters", false); if (temp == "not found") { temp = "1000"; }