X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=amovacommand.cpp;h=8ab08553c4969268be12230b68f0f80303da2989;hb=348de0f8b17d84ede77081dcf67bd6ef43496677;hp=74fbda7ff6164128551bead9cfb4c8bfabb7ba0e;hpb=f6c7165727bc17a5fbbcbb774d75ccffeb7f3da5;p=mothur.git diff --git a/amovacommand.cpp b/amovacommand.cpp index 74fbda7..8ab0855 100644 --- a/amovacommand.cpp +++ b/amovacommand.cpp @@ -117,10 +117,6 @@ AmovaCommand::AmovaCommand(string option) { if (phylipFileName == "not open") { phylipFileName = ""; abort = true; } else if (phylipFileName == "not found") { phylipFileName = ""; - - //check currentFiles for a phylip file - if (currentFiles->getPhylipFile() != "") { phylipFileName = currentFiles->getPhylipFile(); m->mothurOut("Using " + phylipFileName + " as phylip file."); m->mothurOutEndLine(); - }else { m->mothurOut("You must provide an phylip file."); m->mothurOutEndLine(); abort = true; } } //check for required parameters @@ -128,10 +124,6 @@ AmovaCommand::AmovaCommand(string option) { if (designFileName == "not open") { abort = true; } else if (designFileName == "not found") { designFileName = ""; - - //check currentFiles for a design file - if (currentFiles->getDesignFile() != "") { designFileName = currentFiles->getPhylipFile(); m->mothurOut("Using " + designFileName + " as phylip file."); m->mothurOutEndLine(); - }else { m->mothurOut("You must provide an design file."); m->mothurOutEndLine(); abort = true; } } string temp = validParameter.validFile(parameters, "iters", false);