X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=classify.cpp;h=7726b3e00cca9de19971b70656f9581e43e97c8a;hb=d205e70ae86dbee2efc2df02f2717975854de6ba;hp=3bf0d572f88d0ad7ffd76989d71f10807e8cc659;hpb=16abd6271c455bd01b34ff89a2e3641bef0fa128;p=mothur.git diff --git a/classify.cpp b/classify.cpp index 3bf0d57..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; @@ -296,7 +297,9 @@ int Classify::readTaxonomy(string file) { delete buf4; istringstream iss (tempBuf,istringstream::in); - iss >> name >> taxInfo; + 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); } @@ -309,8 +312,11 @@ int Classify::readTaxonomy(string file) { //read template seqs and save while (!inTax.eof()) { - inTax >> name >> taxInfo; - + 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); @@ -319,6 +325,8 @@ int Classify::readTaxonomy(string file) { } inTax.close(); #endif + + phyloTree->assignHeirarchyIDs(0);