#include "consensus.h"
//**********************************************************************************************************************
-Tree* Consensus::getTree(vector<Tree*>& t, TreeMap* tmap){
+Tree* Consensus::getTree(vector<Tree*>& t){
try {
numNodes = t[0]->getNumNodes();
numLeaves = t[0]->getNumLeaves();
if (m->control_pressed) { return 0; }
- consensusTree = new Tree(tmap);
+ consensusTree = new Tree(t[0]->getTreeMap());
it2 = nodePairs.find(treeSet);
buildConsensusTree(treeSet);
- if (m->control_pressed) { delete consensusTree; return 0; }
+ if (m->control_pressed) { delete consensusTree; return 0; }
- consensusTree->assembleTree();
+ map<string, string> empty;
+ consensusTree->assembleTree(empty);
- if (m->control_pressed) { delete consensusTree; return 0; }
+ if (m->control_pressed) { delete consensusTree; return 0; }
return consensusTree;