X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=clustercommand.cpp;h=06e627a615dacf69fe80464db0123582bef510ed;hb=d263f4b3a4f96c672317d317061f6adb72656427;hp=19eaf85bc04fdce079f21a189c7d5bd4baa6eca0;hpb=5a4ac4f954c4b4445bcee272f1f8220ddcc9c1e4;p=mothur.git diff --git a/clustercommand.cpp b/clustercommand.cpp index 19eaf85..06e627a 100644 --- a/clustercommand.cpp +++ b/clustercommand.cpp @@ -154,6 +154,14 @@ ClusterCommand::ClusterCommand(string option) { //if the user has not given a path then, add inputdir. else leave path alone. if (path == "") { parameters["name"] = inputDir + it->second; } } + + it = parameters.find("count"); + //user has given a template file + if(it != parameters.end()){ + path = m->hasPath(it->second); + //if the user has not given a path then, add inputdir. else leave path alone. + if (path == "") { parameters["count"] = inputDir + it->second; } + } } //check for required parameters @@ -481,12 +489,12 @@ void ClusterCommand::printData(string label){ loops = 0; start = time(NULL); + oldRAbund.setLabel(label); if (countfile == "") { oldRAbund.print(rabundFile); oldRAbund.getSAbundVector().print(sabundFile); } - - oldRAbund.setLabel(label); + if (m->isTrue(showabund)) { oldRAbund.getSAbundVector().print(cout); }