X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=consensus.cpp;fp=consensus.cpp;h=d45a395604148c398f0f7c5a3d379476e3bdda97;hb=6c2b1e530a5c0bb87040e58a3e410097acdfcc3d;hp=1be052f3aee81f6f0aded053de8249dd958118dd;hpb=f509429e06e545bde69c97cacc0eb436775bd329;p=mothur.git 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; }