X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=amovacommand.cpp;fp=amovacommand.cpp;h=13c8b2636680ee247cf05750cd57b6d5916b7d9c;hb=5e031adc86a1fc125c4abb3d4048f209d52f9b6d;hp=74fbda7ff6164128551bead9cfb4c8bfabb7ba0e;hpb=f6c7165727bc17a5fbbcbb774d75ccffeb7f3da5;p=mothur.git diff --git a/amovacommand.cpp b/amovacommand.cpp index 74fbda7..13c8b26 100644 --- a/amovacommand.cpp +++ b/amovacommand.cpp @@ -119,8 +119,8 @@ AmovaCommand::AmovaCommand(string option) { 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; } + //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 @@ -130,8 +130,8 @@ AmovaCommand::AmovaCommand(string option) { 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; } + //if (currentFiles->getDesignFile() != "") { designFileName = currentFiles->getDesignFile(); m->mothurOut("Using " + designFileName + " as design file."); m->mothurOutEndLine(); + //}else { m->mothurOut("You must provide an design file."); m->mothurOutEndLine(); abort = true; } } string temp = validParameter.validFile(parameters, "iters", false);