X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=readtree.cpp;h=a253741688c00ddc138d1353ac757456c03643da;hb=9daea1c357d32c6a7b34c5cbec122b7cfc5c92e3;hp=59239c8af0d24e089bfc7eade92ed055ffaa6e64;hpb=ef2b771b08a9753db3800b06b9860317204dad5b;p=mothur.git diff --git a/readtree.cpp b/readtree.cpp index 59239c8..a253741 100644 --- a/readtree.cpp +++ b/readtree.cpp @@ -336,25 +336,24 @@ int ReadNewickTree::readNewickInt(istream& f, int& n, Tree* T) { if(n1 == -1) { cerr << "Name: " << name << " not found in your groupfile.. \n"; exit(1); - globaldata->gTreemap->namesOfSeqs.push_back(name); - globaldata->gTreemap->treemap[name].groupname = "xxx"; - globaldata->gTreemap->treemap[name].vectorIndex = (globaldata->gTreemap->namesOfSeqs.size() - 1); + //globaldata->gTreemap->namesOfSeqs.push_back(name); + //globaldata->gTreemap->treemap[name].groupname = "xxx"; + //globaldata->gTreemap->treemap[name].vectorIndex = (globaldata->gTreemap->namesOfSeqs.size() - 1); - map::iterator it; - it = globaldata->gTreemap->seqsPerGroup.find("xxx"); - if (it == globaldata->gTreemap->seqsPerGroup.end()) { //its a new group - globaldata->gTreemap->namesOfGroups.push_back("xxx"); - globaldata->gTreemap->seqsPerGroup["xxx"] = 1; - }else { - globaldata->gTreemap->seqsPerGroup["xxx"]++; - } + //map::iterator it; + //it = globaldata->gTreemap->seqsPerGroup.find("xxx"); + //if (it == globaldata->gTreemap->seqsPerGroup.end()) { //its a new group + // globaldata->gTreemap->namesOfGroups.push_back("xxx"); + // globaldata->gTreemap->seqsPerGroup["xxx"] = 1; + //}else { + // globaldata->gTreemap->seqsPerGroup["xxx"]++; + //} //find index in tree of name - n1 = T->getIndex(name); - group = "xxx"; - numLeaves++; - numNodes = 2*numLeaves - 1; - //T->resetTree(); + //n1 = T->getIndex(name); + //group = "xxx"; + //numLeaves++; + //numNodes = 2*numLeaves - 1; } T->tree[n1].setGroup(group);