X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=classify.cpp;h=2d01183479a504c798a18071df045f723643f850;hb=8a0b2fd6644dee848b262fcdea73b912a6054fed;hp=25aa2dd7b9f2f8a4f36030eebf0d3284f7d28b08;hpb=ba2b95b22ab8947d5583ca2c2da74557870b6861;p=mothur.git diff --git a/classify.cpp b/classify.cpp index 25aa2dd..2d01183 100644 --- a/classify.cpp +++ b/classify.cpp @@ -238,7 +238,7 @@ void Classify::generateDatabaseAndNames(string tfile, string tempFile, string me } } /**************************************************************************************************/ -Classify::Classify() { m = MothurOut::getInstance(); database = NULL; } +Classify::Classify() { m = MothurOut::getInstance(); database = NULL; flipped=false; } /**************************************************************************************************/ int Classify::readTaxonomy(string file) { @@ -296,7 +296,8 @@ int Classify::readTaxonomy(string file) { delete buf4; istringstream iss (tempBuf,istringstream::in); - iss >> name >> taxInfo; + iss >> name; m->gobble(iss); + iss >> taxInfo; taxonomy[name] = taxInfo; phyloTree->addSeqToTree(name, taxInfo); } @@ -309,8 +310,9 @@ int Classify::readTaxonomy(string file) { //read template seqs and save while (!inTax.eof()) { - inTax >> name >> taxInfo; - + inTax >> name; m->gobble(inTax); + inTax >> taxInfo; + taxonomy[name] = taxInfo; phyloTree->addSeqToTree(name, taxInfo);