X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=clusterdoturcommand.cpp;h=4471b357d268490a2c22ff7d44e9172be392512b;hb=1d898dc6edaf9e9f287fab53bf1f21fb29757a17;hp=1c0c78d274359b7156506f6697e0aa039754a38d;hpb=6cf9539162b0fb0b5c0b99673e999df3cd717c55;p=mothur.git diff --git a/clusterdoturcommand.cpp b/clusterdoturcommand.cpp index 1c0c78d..4471b35 100644 --- a/clusterdoturcommand.cpp +++ b/clusterdoturcommand.cpp @@ -11,52 +11,55 @@ #include "clusterclassic.h" //********************************************************************************************************************** -vector ClusterDoturCommand::getValidParameters(){ +vector ClusterDoturCommand::setParameters(){ try { - string AlignArray[] = {"phylip","cutoff","precision","method","outputdir","inputdir"}; - vector myArray (AlignArray, AlignArray+(sizeof(AlignArray)/sizeof(string))); + CommandParameter pphylip("phylip", "InputTypes", "", "", "none", "none", "none",false,true); parameters.push_back(pphylip); + CommandParameter pname("name", "InputTypes", "", "", "none", "none", "none",false,false); parameters.push_back(pname); + CommandParameter pcutoff("cutoff", "Number", "", "10", "", "", "",false,false); parameters.push_back(pcutoff); + CommandParameter pprecision("precision", "Number", "", "100", "", "", "",false,false); parameters.push_back(pprecision); + CommandParameter pmethod("method", "Multiple", "furthest-nearest-average-weighted", "furthest", "", "", "",false,false); parameters.push_back(pmethod); + CommandParameter phard("hard", "Boolean", "", "F", "", "", "",false,false); parameters.push_back(phard); + CommandParameter psim("sim", "Boolean", "", "F", "", "", "",false,false); parameters.push_back(psim); + CommandParameter pinputdir("inputdir", "String", "", "", "", "", "",false,false); parameters.push_back(pinputdir); + CommandParameter poutputdir("outputdir", "String", "", "", "", "", "",false,false); parameters.push_back(poutputdir); + + vector myArray; + for (int i = 0; i < parameters.size(); i++) { myArray.push_back(parameters[i].name); } return myArray; } catch(exception& e) { - m->errorOut(e, "ClusterDoturCommand", "getValidParameters"); - exit(1); - } -} -//********************************************************************************************************************** -ClusterDoturCommand::ClusterDoturCommand(){ - try { - abort = true; - //initialize outputTypes - vector tempOutNames; - outputTypes["list"] = tempOutNames; - outputTypes["rabund"] = tempOutNames; - outputTypes["sabund"] = tempOutNames; - } - catch(exception& e) { - m->errorOut(e, "ClusterDoturCommand", "ClusterCommand"); + m->errorOut(e, "ClusterDoturCommand", "setParameters"); exit(1); } } //********************************************************************************************************************** -vector ClusterDoturCommand::getRequiredParameters(){ +string ClusterDoturCommand::getHelpString(){ try { - string Array[] = {"phylip"}; - vector myArray (Array, Array+(sizeof(Array)/sizeof(string))); - return myArray; + string helpString = ""; + helpString += "The cluster.classic command clusters using the algorithm from dotur. \n"; + helpString += "The cluster.classic command parameter options are phylip, name, method, cuttoff, hard, sim, precision. Phylip is required, unless you have a valid current file.\n"; + helpString += "The cluster.classic command should be in the following format: \n"; + helpString += "cluster.classic(phylip=yourDistanceMatrix, method=yourMethod, cutoff=yourCutoff, precision=yourPrecision) \n"; + helpString += "The acceptable cluster methods are furthest, nearest, weighted and average. If no method is provided then furthest is assumed.\n"; + return helpString; } catch(exception& e) { - m->errorOut(e, "ClusterDoturCommand", "getRequiredParameters"); + m->errorOut(e, "ClusterDoturCommand", "getHelpString"); exit(1); } } //********************************************************************************************************************** -vector ClusterDoturCommand::getRequiredFiles(){ +ClusterDoturCommand::ClusterDoturCommand(){ try { - vector myArray; - return myArray; + abort = true; calledHelp = true; + setParameters(); + vector tempOutNames; + outputTypes["list"] = tempOutNames; + outputTypes["rabund"] = tempOutNames; + outputTypes["sabund"] = tempOutNames; } catch(exception& e) { - m->errorOut(e, "ClusterDoturCommand", "getRequiredFiles"); + m->errorOut(e, "ClusterDoturCommand", "ClusterCommand"); exit(1); } } @@ -65,15 +68,13 @@ vector ClusterDoturCommand::getRequiredFiles(){ ClusterDoturCommand::ClusterDoturCommand(string option) { try{ - abort = false; + abort = false; calledHelp = false; //allow user to run help - if(option == "help") { help(); abort = true; } + if(option == "help") { help(); abort = true; calledHelp = true; } else { - //valid paramters for this command - string Array[] = {"phylip","cutoff","precision","method","outputdir","inputdir"}; - vector myArray (Array, Array+(sizeof(Array)/sizeof(string))); + vector myArray = setParameters(); OptionParser parser(option); map parameters = parser.getParameters(); @@ -123,7 +124,14 @@ ClusterDoturCommand::ClusterDoturCommand(string option) { //check for required parameters phylipfile = validParameter.validFile(parameters, "phylip", true); if (phylipfile == "not open") { abort = true; } - else if (phylipfile == "not found") { phylipfile = ""; m->mothurOut("When executing the cluster.dotur command you must enter a phylip file."); m->mothurOutEndLine(); abort = true; } + else if (phylipfile == "not found") { + phylipfile = m->getPhylipFile(); + if (phylipfile != "") { m->mothurOut("Using " + phylipfile + " as input file for the phylip parameter."); m->mothurOutEndLine(); } + else { + m->mothurOut("You need to provide a phylip file with the cluster.classic command."); m->mothurOutEndLine(); + abort = true; + } + } //check for optional parameter and set defaults @@ -146,6 +154,9 @@ ClusterDoturCommand::ClusterDoturCommand(string option) { temp = validParameter.validFile(parameters, "hard", false); if (temp == "not found") { temp = "F"; } hard = m->isTrue(temp); + temp = validParameter.validFile(parameters, "sim", false); if (temp == "not found") { temp = "F"; } + sim = m->isTrue(temp); + method = validParameter.validFile(parameters, "method", false); if (method == "not found") { method = "furthest"; } @@ -162,34 +173,12 @@ ClusterDoturCommand::ClusterDoturCommand(string option) { exit(1); } } - -//********************************************************************************************************************** - -void ClusterDoturCommand::help(){ - try { - m->mothurOut("The cluster.classic command clusters using the algorithm from dotur. \n"); - m->mothurOut("The cluster.classic command parameter options are phylip, name, method, cuttoff, hard, precision. Phylip is required.\n"); - m->mothurOut("The cluster.classic command should be in the following format: \n"); - m->mothurOut("cluster.classic(phylip=yourDistanceMatrix, method=yourMethod, cutoff=yourCutoff, precision=yourPrecision) \n"); - m->mothurOut("The acceptable cluster methods are furthest, nearest, weighted and average. If no method is provided then furthest is assumed.\n\n"); - - } - catch(exception& e) { - m->errorOut(e, "ClusterDoturCommand", "help"); - exit(1); - } -} - -//********************************************************************************************************************** - -ClusterDoturCommand::~ClusterDoturCommand(){} - //********************************************************************************************************************** int ClusterDoturCommand::execute(){ try { - if (abort == true) { return 0; } + if (abort == true) { if (calledHelp) { return 0; } return 2; } if(namefile != ""){ nameMap = new NameAssignment(namefile); @@ -199,7 +188,7 @@ int ClusterDoturCommand::execute(){ } //reads phylip file storing data in 2D vector, also fills list and rabund - ClusterClassic* cluster = new ClusterClassic(cutoff, method); + ClusterClassic* cluster = new ClusterClassic(cutoff, method, sim); cluster->readPhylipFile(phylipfile, nameMap); if (m->control_pressed) { delete cluster; delete list; delete rabund; return 0; } @@ -223,12 +212,11 @@ int ClusterDoturCommand::execute(){ oldRAbund = *rabund; oldList = *list; - double saveCutoff = cutoff; + //double saveCutoff = cutoff; int estart = time(NULL); - while (cluster->getSmallDist() < cutoff && cluster->getNSeqs() > 0){ - + while ((cluster->getSmallDist() < cutoff) && (cluster->getNSeqs() > 1)){ if (m->control_pressed) { delete cluster; delete list; delete rabund; sabundFile.close();rabundFile.close();listFile.close(); for (int i = 0; i < outputNames.size(); i++) { remove(outputNames[i].c_str()); } outputTypes.clear(); return 0; } cluster->update(cutoff); @@ -267,10 +255,29 @@ int ClusterDoturCommand::execute(){ delete cluster; delete nameMap; delete list; delete rabund; - if (saveCutoff != cutoff) { - if (hard) { saveCutoff = m->ceilDist(saveCutoff, precision); } - else { saveCutoff = m->roundDist(saveCutoff, precision); } - m->mothurOut("changed cutoff to " + toString(cutoff)); m->mothurOutEndLine(); + //if (saveCutoff != cutoff) { + // if (hard) { saveCutoff = m->ceilDist(saveCutoff, precision); } + // else { saveCutoff = m->roundDist(saveCutoff, precision); } + // m->mothurOut("changed cutoff to " + toString(cutoff)); m->mothurOutEndLine(); + //} + + //set list file as new current listfile + string current = ""; + itTypes = outputTypes.find("list"); + if (itTypes != outputTypes.end()) { + if ((itTypes->second).size() != 0) { current = (itTypes->second)[0]; m->setListFile(current); } + } + + //set rabund file as new current rabundfile + itTypes = outputTypes.find("rabund"); + if (itTypes != outputTypes.end()) { + if ((itTypes->second).size() != 0) { current = (itTypes->second)[0]; m->setRabundFile(current); } + } + + //set sabund file as new current sabundfile + itTypes = outputTypes.find("sabund"); + if (itTypes != outputTypes.end()) { + if ((itTypes->second).size() != 0) { current = (itTypes->second)[0]; m->setSabundFile(current); } } m->mothurOutEndLine();