X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=consensus.cpp;h=d45a395604148c398f0f7c5a3d379476e3bdda97;hp=1be052f3aee81f6f0aded053de8249dd958118dd;hb=b206f634aae1b4ce13978d203247fb64757d5482;hpb=0caf3fbabaa3ece404f8ce77f4c883dc5b1bf1dc diff --git a/consensus.cpp b/consensus.cpp index 1be052f..d45a395 100644 --- a/consensus.cpp +++ b/consensus.cpp @@ -21,7 +21,7 @@ Tree* Consensus::getTree(vector& t){ if (m->control_pressed) { return 0; } - consensusTree = new Tree(t[0]->getTreeMap()); + consensusTree = new Tree(t[0]->getCountTable()); it2 = nodePairs.find(treeSet); @@ -37,8 +37,7 @@ Tree* Consensus::getTree(vector& t){ if (m->control_pressed) { delete consensusTree; return 0; } - map empty; - consensusTree->assembleTree(empty); + consensusTree->assembleTree(); if (m->control_pressed) { delete consensusTree; return 0; }