X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=readdistcommand.cpp;h=c600eb86c969303f608b6a440dedb77af3e50b1d;hb=fd5f17bcbe5fadab2c525f3d1fcfd1d79a60ae72;hp=0445eec63328e2cf7a646f1cc662bb36fdd3bb98;hpb=260ae19c36cb11a53ddc5a75b5e507f8dd8b31d6;p=mothur.git diff --git a/readdistcommand.cpp b/readdistcommand.cpp index 0445eec..c600eb8 100644 --- a/readdistcommand.cpp +++ b/readdistcommand.cpp @@ -12,6 +12,42 @@ #include "readcolumn.h" #include "readmatrix.hpp" +//********************************************************************************************************************** +vector ReadDistCommand::getValidParameters(){ + try { + string Array[] = {"phylip", "column", "name", "cutoff", "precision", "group","outputdir","inputdir","sim"}; + vector myArray (Array, Array+(sizeof(Array)/sizeof(string))); + return myArray; + } + catch(exception& e) { + m->errorOut(e, "ReadDistCommand", "getValidParameters"); + exit(1); + } +} +//********************************************************************************************************************** +vector ReadDistCommand::getRequiredParameters(){ + try { + string Array[] = {"phylip","column","or"}; + vector myArray (Array, Array+(sizeof(Array)/sizeof(string))); + return myArray; + } + catch(exception& e) { + m->errorOut(e, "ReadDistCommand", "getRequiredParameters"); + exit(1); + } +} +//********************************************************************************************************************** +vector ReadDistCommand::getRequiredFiles(){ + try { + vector myArray; + return myArray; + } + catch(exception& e) { + m->errorOut(e, "ReadDistCommand", "getRequiredFiles"); + exit(1); + } +} +//********************************************************************************************************************** ReadDistCommand::ReadDistCommand(string option) { try { globaldata = GlobalData::getInstance(); @@ -208,8 +244,6 @@ int ReadDistCommand::execute(){ time_t start = time(NULL); size_t numDists = 0; - vector outputNames; - if (format == "matrix") { ifstream in; m->openInputFile(distFileName, in);