X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=clusterdoturcommand.cpp;h=dadc9cc485dedeec55a1057474f2eab19bf0d4ab;hb=250e3b11b1c9c1e1ad458ab6c7e71ac2e67e11d9;hp=4463896cefd13f6bafcc625846fd94213b610ba7;hpb=1a5c2356c1b955c6ec024b2baf9f46377ee7c72e;p=mothur.git diff --git a/clusterdoturcommand.cpp b/clusterdoturcommand.cpp index 4463896..dadc9cc 100644 --- a/clusterdoturcommand.cpp +++ b/clusterdoturcommand.cpp @@ -226,7 +226,7 @@ int ClusterDoturCommand::execute(){ delete nameMap; }else if (countfile != "") { ct = new CountTable(); - ct->readTable(countfile); + ct->readTable(countfile, false, false); cluster->readPhylipFile(phylipfile, ct); delete ct; }else { @@ -244,10 +244,10 @@ int ClusterDoturCommand::execute(){ map variables; variables["[filename]"] = fileroot; - if (countfile != "") { variables["[tag2]"] = "unique_list"; } variables["[clustertag]"] = tag; string sabundFileName = getOutputFileName("sabund", variables); string rabundFileName = getOutputFileName("rabund", variables); + if (countfile != "") { variables["[tag2]"] = "unique_list"; } string listFileName = getOutputFileName("list", variables); if (countfile == "") { @@ -259,6 +259,7 @@ int ClusterDoturCommand::execute(){ } m->openOutputFile(listFileName, listFile); outputNames.push_back(listFileName); outputTypes["list"].push_back(listFileName); + list->printHeaders(listFile); float previousDist = 0.00000; float rndPreviousDist = 0.00000;