From: westcott Date: Tue, 8 Feb 2011 12:41:30 +0000 (+0000) Subject: added amova command X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=commitdiff_plain;h=1e0359c041eedc99670c93d824a2cf7fa72577cc added amova command --- diff --git a/amovacommand.cpp b/amovacommand.cpp index a88baf0..d46cf74 100644 --- a/amovacommand.cpp +++ b/amovacommand.cpp @@ -173,7 +173,7 @@ AmovaCommand::AmovaCommand(string option) { m->mothurOut("You must read a list and a group, a shared file or provide a distance matrix before you can use the amova command."); m->mothurOutEndLine(); abort = true; } }else { sharedfile = globaldata->getSharedFile(); } - + //use distance matrix if one is provided if ((sharedfile != "") && (phylipfile != "")) { sharedfile = ""; } @@ -412,7 +412,7 @@ int AmovaCommand::execute(){ out.close(); } - InputData input("sharedfile", sharedfile); + InputData input(sharedfile, "sharedfile"); vector lookup = input.getSharedRAbundVectors(); string lastLabel = lookup[0]->getLabel();