X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=classify.cpp;h=7726b3e00cca9de19971b70656f9581e43e97c8a;hb=d205e70ae86dbee2efc2df02f2717975854de6ba;hp=2d01183479a504c798a18071df045f723643f850;hpb=0caf3fbabaa3ece404f8ce77f4c883dc5b1bf1dc;p=mothur.git diff --git a/classify.cpp b/classify.cpp index 2d01183..7726b3e 100644 --- a/classify.cpp +++ b/classify.cpp @@ -249,7 +249,8 @@ int Classify::readTaxonomy(string file) { m->mothurOutEndLine(); m->mothurOut("Reading in the " + file + " taxonomy...\t"); cout.flush(); - + if (m->debug) { m->mothurOut("[DEBUG]: Taxonomies read in...\n"); } + #ifdef USE_MPI int pid, num, processors; vector positions; @@ -298,6 +299,7 @@ int Classify::readTaxonomy(string file) { istringstream iss (tempBuf,istringstream::in); iss >> name; m->gobble(iss); iss >> taxInfo; + if (m->debug) { m->mothurOut("[DEBUG]: name = " + name + " tax = " + taxInfo + "\n"); } taxonomy[name] = taxInfo; phyloTree->addSeqToTree(name, taxInfo); } @@ -312,7 +314,9 @@ int Classify::readTaxonomy(string file) { while (!inTax.eof()) { inTax >> name; m->gobble(inTax); inTax >> taxInfo; - + + if (m->debug) { m->mothurOut("[DEBUG]: name = '" + name + "' tax = '" + taxInfo + "'\n"); } + taxonomy[name] = taxInfo; phyloTree->addSeqToTree(name, taxInfo); @@ -321,6 +325,8 @@ int Classify::readTaxonomy(string file) { } inTax.close(); #endif + + phyloTree->assignHeirarchyIDs(0);