if(allLines == 1 || lines.count(count) == 1 || labels.count(order->getLabel()) == 1){
- mothurOut(order->getLabel() + "\t" + toString(count)); mothurOutEndLine();
+ mothurOut(order->getLabel()); mothurOutEndLine();
process(order);
processedLabels.insert(order->getLabel());
delete order;
order = input->getSharedOrderVector(lastLabel);
- mothurOut(order->getLabel() + "\t" + toString(count)); mothurOutEndLine();
+ mothurOut(order->getLabel()); mothurOutEndLine();
process(order);
processedLabels.insert(order->getLabel());
if (needToRun == true) {
delete order;
order = input->getSharedOrderVector(lastLabel);
- mothurOut(order->getLabel() + "\t" + toString(count)); mothurOutEndLine();
+ mothurOut(order->getLabel()); mothurOutEndLine();
process(order);
delete order;
//creates tree from similarity matrix and write out file
createTree(out[i], tempTree);
- //save trees for concensus command.
+ //save trees for consensus command.
trees[i].push_back(tempTree);
}
}
mothurOut("\tDone."); mothurOutEndLine();
//delete globaldata's tree
- for (int m = 0; m < globaldata->gTree.size(); m++) { delete globaldata->gTree[m]; }
- globaldata->clear();
+ //for (int m = 0; m < globaldata->gTree.size(); m++) { delete globaldata->gTree[m]; }
+ //globaldata->gTree.clear();
- //create concensus trees for each bootstrapped tree set
+ //create consensus trees for each bootstrapped tree set
for (int k = 0; k < trees.size(); k++) {
- mothurOut("Generating concensus tree for " + treeCalculators[k]->getName()); mothurOutEndLine();
+ mothurOut("Generating consensus tree for " + treeCalculators[k]->getName()); mothurOutEndLine();
//set global data to calc trees
globaldata->gTree = trees[k];
string filename = getRootName(globaldata->inputFileName) + treeCalculators[k]->getName() + ".boot" + order->getLabel();
- concensus = new ConcensusCommand(filename);
- concensus->execute();
- delete concensus;
+ consensus = new ConcensusCommand(filename);
+ consensus->execute();
+ delete consensus;
//delete globaldata's tree
- for (int m = 0; m < globaldata->gTree.size(); m++) { delete globaldata->gTree[m]; }
- globaldata->clear();
+ //for (int m = 0; m < globaldata->gTree.size(); m++) { delete globaldata->gTree[m]; }
+ //globaldata->gTree.clear();
}