X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=readtree.cpp;h=b9c38e973f2cea531c03c17071ed65a155bf65a3;hp=e98524b45e9ec513fe171c5a342ab381a68fcacc;hb=615301e57c25e241356a9c2380648d117709458d;hpb=9b884118e97081d743c7b001216567f9b9131258 diff --git a/readtree.cpp b/readtree.cpp index e98524b..b9c38e9 100644 --- a/readtree.cpp +++ b/readtree.cpp @@ -12,9 +12,7 @@ /***********************************************************************/ ReadTree::ReadTree() { try { - globaldata = GlobalData::getInstance(); m = MothurOut::getInstance(); - globaldata->gTree.clear(); } catch(exception& e) { m->errorOut(e, "ReadTree", "ReadTree"); @@ -22,6 +20,21 @@ ReadTree::ReadTree() { } } /***********************************************************************/ +int ReadTree::AssembleTrees() { + try { + //assemble users trees + for (int i = 0; i < Trees.size(); i++) { + if (m->control_pressed) { return 0; } + Trees[i]->assembleTree(); + } + return 0; + } + catch(exception& e) { + m->errorOut(e, "ReadTree", "AssembleTrees"); + exit(1); + } +} +/***********************************************************************/ int ReadTree::readSpecialChar(istream& f, char c, string name) { try { @@ -94,7 +107,7 @@ float ReadTree::readBranchLength(istream& f) { /***********************************************************************/ //This class reads a file in Newick form and stores it in a tree. -int ReadNewickTree::read() { +int ReadNewickTree::read(CountTable* ct) { try { holder = ""; int c, error; @@ -102,8 +115,10 @@ int ReadNewickTree::read() { //if you are not a nexus file if ((c = filehandle.peek()) != '#') { - while((c = filehandle.peek()) != EOF) { + while((c = filehandle.peek()) != EOF) { + if (m->control_pressed) { filehandle.close(); return 0; } while ((c = filehandle.peek()) != EOF) { + if (m->control_pressed) { filehandle.close(); return 0; } // get past comments if(c == '[') { comment = 1; @@ -116,23 +131,28 @@ int ReadNewickTree::read() { } //make new tree - T = new Tree(); + T = new Tree(ct); numNodes = T->getNumNodes(); numLeaves = T->getNumLeaves(); - error = readTreeString(); + error = readTreeString(ct); //save trees for later commands - globaldata->gTree.push_back(T); + Trees.push_back(T); m->gobble(filehandle); } //if you are a nexus file }else if ((c = filehandle.peek()) == '#') { - nexusTranslation(); //reads file through the translation and updates treemap - while((c = filehandle.peek()) != EOF) { + //get right number of seqs from nexus file. + Tree* temp = new Tree(ct); delete temp; + + nexusTranslation(ct); //reads file through the translation and updates treemap + while((c = filehandle.peek()) != EOF) { + if (m->control_pressed) { filehandle.close(); return 0; } // get past comments - while ((c = filehandle.peek()) != EOF) { + while ((c = filehandle.peek()) != EOF) { + if (m->control_pressed) { filehandle.close(); return 0; } if(holder == "[" || holder == "[!"){ comment = 1; } @@ -150,15 +170,15 @@ int ReadNewickTree::read() { filehandle.putback(c); //put back first ( of tree. //make new tree - T = new Tree(); + T = new Tree(ct); numNodes = T->getNumNodes(); numLeaves = T->getNumLeaves(); //read tree info - error = readTreeString(); + error = readTreeString(ct); //save trees for later commands - globaldata->gTree.push_back(T); + Trees.push_back(T); } } @@ -175,11 +195,11 @@ int ReadNewickTree::read() { } /**************************************************************************************************/ //This function read the file through the translation of the sequences names and updates treemap. -void ReadNewickTree::nexusTranslation() { +string ReadNewickTree::nexusTranslation(CountTable* ct) { try { holder = ""; - int numSeqs = globaldata->gTreemap->getNumSeqs(); //must save this some when we clear old names we can still know how many sequences there were + int numSeqs = m->Treenames.size(); //must save this some when we clear old names we can still know how many sequences there were int comment = 0; // get past comments @@ -191,23 +211,19 @@ void ReadNewickTree::nexusTranslation() { comment = 0; } filehandle >> holder; - if(holder == "tree" && comment != 1){return;} + if(holder == "tree" && comment != 1){return holder;} } - - //update treemap - globaldata->gTreemap->namesOfSeqs.clear(); + + string number, name; for(int i=0;i> number; filehandle >> name; name.erase(name.end()-1); //erase the comma - //insert new one with new name - globaldata->gTreemap->treemap[toString(number)].groupname = globaldata->gTreemap->treemap[name].groupname; - globaldata->gTreemap->treemap[toString(number)].vectorIndex = globaldata->gTreemap->treemap[name].vectorIndex; - //erase old one. so treemap[sarah].groupnumber is now treemap[1].groupnumber. if number is 1 and name is sarah. - globaldata->gTreemap->treemap.erase(name); - globaldata->gTreemap->namesOfSeqs.push_back(number); + ct->renameSeq(name, toString(number)); } + + return name; } catch(exception& e) { m->errorOut(e, "ReadNewickTree", "nexusTranslation"); @@ -216,7 +232,7 @@ void ReadNewickTree::nexusTranslation() { } /**************************************************************************************************/ -int ReadNewickTree::readTreeString() { +int ReadNewickTree::readTreeString(CountTable* ct) { try { int n = 0; @@ -229,8 +245,8 @@ int ReadNewickTree::readTreeString() { if(ch == '('){ n = numLeaves; //number of leaves / sequences, we want node 1 to start where the leaves left off - lc = readNewickInt(filehandle, n, T); - if (lc == -1) { m->mothurOut("error with lc"); m->mothurOutEndLine(); return -1; } //reports an error in reading + lc = readNewickInt(filehandle, n, T, ct); + if (lc == -1) { m->mothurOut("error with lc"); m->mothurOutEndLine(); m->control_pressed = true; return -1; } //reports an error in reading if(filehandle.peek()==','){ readSpecialChar(filehandle,',',"comma"); @@ -241,8 +257,8 @@ int ReadNewickTree::readTreeString() { } if(rooted != 1){ - rc = readNewickInt(filehandle, n, T); - if (rc == -1) { m->mothurOut("error with rc"); m->mothurOutEndLine(); return -1; } //reports an error in reading + rc = readNewickInt(filehandle, n, T, ct); + if (rc == -1) { m->mothurOut("error with rc"); m->mothurOutEndLine(); m->control_pressed = true; return -1; } //reports an error in reading if(filehandle.peek() == ')'){ readSpecialChar(filehandle,')',"right parenthesis"); } @@ -286,7 +302,7 @@ int ReadNewickTree::readTreeString() { } /**************************************************************************************************/ -int ReadNewickTree::readNewickInt(istream& f, int& n, Tree* T) { +int ReadNewickTree::readNewickInt(istream& f, int& n, Tree* T, CountTable* ct) { try { if (m->control_pressed) { return -1; } @@ -299,7 +315,7 @@ int ReadNewickTree::readNewickInt(istream& f, int& n, Tree* T) { //read all children vector childrenNodes; while(f.peek() != ')'){ - int child = readNewickInt(f, n, T); + int child = readNewickInt(f, n, T, ct); if (child == -1) { return -1; } //reports an error in reading //cout << "child = " << child << endl; childrenNodes.push_back(child); @@ -347,12 +363,7 @@ int ReadNewickTree::readNewickInt(istream& f, int& n, Tree* T) { }else{ T->tree[n].setBranchLength(0.0); } - - //T->tree[n].setChildren(lc,rc); - //T->tree[lc].setParent(n); - //T->tree[rc].setParent(n); - //T->printTree(); cout << endl; - + return n++; }else{ @@ -370,33 +381,27 @@ int ReadNewickTree::readNewickInt(istream& f, int& n, Tree* T) { f.putback(d); //set group info - string group = globaldata->gTreemap->getGroup(name); - + vector group = ct->getGroups(name); + //cout << name << endl; //find index in tree of name int n1 = T->getIndex(name); //adds sequence names that are not in group file to the "xxx" group - if(group == "not found") { + if(group.size() == 0) { m->mothurOut("Name: " + name + " is not in your groupfile, and will be disregarded. \n"); //readOk = -1; return n1; - globaldata->gTreemap->namesOfSeqs.push_back(name); - globaldata->gTreemap->treemap[name].groupname = "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"]++; - } - - group = "xxx"; - } - - vector tempGroup; tempGroup.push_back(group); - - T->tree[n1].setGroup(tempGroup); + vector currentGroups = ct->getNamesOfGroups(); + if (!m->inUsersGroups("xxx", currentGroups)) { ct->addGroup("xxx"); } + currentGroups = ct->getNamesOfGroups(); + vector thisCounts; thisCounts.resize(currentGroups.size(), 0); + for (int h = 0; h < currentGroups.size(); h++) { + if (currentGroups[h] == "xxx") { thisCounts[h] = 1; break; } + } + ct->push_back(name, thisCounts); + + group.push_back("xxx"); + } + T->tree[n1].setGroup(group); T->tree[n1].setChildren(-1,-1); if(blen == 1){